mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 14:16:16 -04:00
- Restored compilation of most tests (The part using previously named p3ConnectMgr is still to be done).
- moved ftSearchDummy and ftDataSendPair in tests/ft since it is only used there. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6009 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler
parent
6571279b70
commit
bc65dd40c2
48 changed files with 314 additions and 1797 deletions
|
|
@ -1,146 +0,0 @@
|
|||
/*
|
||||
* libretroshare/src/ft: ftdata.cc
|
||||
*
|
||||
* File Transfer for RetroShare.
|
||||
*
|
||||
* Copyright 2008 by Robert Fernie.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License Version 2 as published by the Free Software Foundation.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA.
|
||||
*
|
||||
* Please report all bugs and problems to "retroshare@lunamutt.com".
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ft/ftdata.h"
|
||||
|
||||
/******* Pair of Send/Recv (Only need to handle Send side) ******/
|
||||
ftDataSendPair::ftDataSendPair(ftDataRecv *recv)
|
||||
:mDataRecv(recv)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* Client Send */
|
||||
bool ftDataSendPair::sendDataRequest(const std::string &peerId, const std::string &hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize)
|
||||
{
|
||||
return mDataRecv->recvDataRequest(peerId,hash,size,offset,chunksize);
|
||||
}
|
||||
|
||||
/* Server Send */
|
||||
bool ftDataSendPair::sendData(const std::string &peerId, const std::string &hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize, void *data)
|
||||
{
|
||||
return mDataRecv->recvData(peerId, hash,size,offset,chunksize,data);
|
||||
}
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
bool ftDataSendPair::sendChunkMapRequest(const std::string& peer_id,const std::string& hash,bool is_client)
|
||||
{
|
||||
return mDataRecv->recvChunkMapRequest(peer_id,hash,is_client);
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataSendPair::sendChunkMap(const std::string& peer_id,const std::string& hash, const CompressedChunkMap& cmap,bool is_client)
|
||||
{
|
||||
return mDataRecv->recvChunkMap(peer_id,hash,cmap, is_client);
|
||||
}
|
||||
/* Send a request for a chunk map */
|
||||
bool ftDataSendPair::sendCRC32MapRequest(const std::string& peer_id,const std::string& hash)
|
||||
{
|
||||
return mDataRecv->recvCRC32MapRequest(peer_id,hash);
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataSendPair::sendCRC32Map(const std::string& peer_id,const std::string& hash, const CRC32Map& crcmap)
|
||||
{
|
||||
return mDataRecv->recvCRC32Map(peer_id,hash,crcmap) ;
|
||||
}
|
||||
/* Client Send */
|
||||
bool ftDataSendDummy::sendDataRequest(const std::string &/*peerId*/, const std::string &/*hash*/,
|
||||
uint64_t /*size*/, uint64_t /*offset*/, uint32_t /*chunksize*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Server Send */
|
||||
bool ftDataSendDummy::sendData(const std::string &/*peerId*/, const std::string &/*hash*/,
|
||||
uint64_t /*size*/, uint64_t /*offset*/, uint32_t /*chunksize*/, void */*data*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
bool ftDataSendDummy::sendChunkMapRequest(const std::string& /*peer_id*/,const std::string& /*hash*/,bool /*is_client*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataSendDummy::sendChunkMap(const std::string& /*peer_id*/,const std::string& /*hash*/, const CompressedChunkMap& /*cmap*/,bool /*is_client*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
bool ftDataSendDummy::sendCRC32MapRequest(const std::string& /*peer_id*/,const std::string& /*hash*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataSendDummy::sendCRC32Map(const std::string& /*peer_id*/,const std::string& /*hash*/, const CRC32Map& /*cmap*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Client Recv */
|
||||
bool ftDataRecvDummy::recvData(const std::string &/*peerId*/, const std::string &/*hash*/,
|
||||
uint64_t /*size*/, uint64_t /*offset*/, uint32_t /*chunksize*/, void */*data*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/* Server Recv */
|
||||
bool ftDataRecvDummy::recvDataRequest(const std::string &/*peerId*/, const std::string &/*hash*/,
|
||||
uint64_t /*size*/, uint64_t /*offset*/, uint32_t /*chunksize*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
bool ftDataRecvDummy::recvChunkMapRequest(const std::string& /*peer_id*/,const std::string& /*hash*/,
|
||||
bool /*is_client*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataRecvDummy::recvChunkMap(const std::string& /*peer_id*/,const std::string& /*hash*/,
|
||||
const CompressedChunkMap& /*cmap*/,bool /*is_client*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ftDataRecvDummy::sendCRC32MapRequest(const std::string& /*peer_id*/,const std::string& /*hash*/)
|
||||
{
|
||||
return true ;
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataRecvDummy::sendCRC32Map(const std::string& /*peer_id*/,const std::string& /*hash*/, const CompressedChunkMap& /*cmap*/)
|
||||
{
|
||||
return true ;
|
||||
}
|
||||
|
|
@ -101,92 +101,4 @@ class ftDataRecv
|
|||
virtual bool recvCRC32Map(const std::string& peer_id,const std::string& hash,const CRC32Map& crcmap) = 0;
|
||||
};
|
||||
|
||||
/**************** FOR TESTING ***********************/
|
||||
|
||||
/******* Pair of Send/Recv (Only need to handle Send side) ******/
|
||||
class ftDataSendPair: public ftDataSend
|
||||
{
|
||||
public:
|
||||
|
||||
ftDataSendPair(ftDataRecv *recv);
|
||||
virtual ~ftDataSendPair() { return; }
|
||||
|
||||
/* Client Send */
|
||||
virtual bool sendDataRequest(const std::string &peerId, const std::string &hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize);
|
||||
|
||||
/* Server Send */
|
||||
virtual bool sendData(const std::string &peerId, const std::string &hash, uint64_t size,
|
||||
uint64_t offset, uint32_t chunksize, void *data);
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
virtual bool sendChunkMapRequest(const std::string& peer_id,const std::string& hash,bool is_client);
|
||||
|
||||
/* Send a chunk map */
|
||||
virtual bool sendChunkMap(const std::string& peer_id,const std::string& hash, const CompressedChunkMap& cmap,bool is_client);
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
virtual bool sendCRC32MapRequest(const std::string& peer_id,const std::string& hash);
|
||||
|
||||
/* Send a chunk map */
|
||||
virtual bool sendCRC32Map(const std::string& peer_id,const std::string& hash, const CRC32Map& cmap);
|
||||
ftDataRecv *mDataRecv;
|
||||
};
|
||||
|
||||
|
||||
class ftDataSendDummy: public ftDataSend
|
||||
{
|
||||
public:
|
||||
virtual ~ftDataSendDummy() { return; }
|
||||
|
||||
/* Client Send */
|
||||
virtual bool sendDataRequest(const std::string &peerId, const std::string &hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize);
|
||||
|
||||
/* Server Send */
|
||||
virtual bool sendData(const std::string &peerId, const std::string &hash, uint64_t size,
|
||||
uint64_t offset, uint32_t chunksize, void *data);
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
virtual bool sendChunkMapRequest(const std::string& peer_id,const std::string& hash,bool is_client);
|
||||
|
||||
/* Send a chunk map */
|
||||
virtual bool sendChunkMap(const std::string& peer_id,const std::string& hash, const CompressedChunkMap& cmap,bool is_client);
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
virtual bool sendCRC32MapRequest(const std::string& peer_id,const std::string& hash);
|
||||
|
||||
/* Send a chunk map */
|
||||
virtual bool sendCRC32Map(const std::string& peer_id,const std::string& hash, const CRC32Map& cmap);
|
||||
};
|
||||
|
||||
class ftDataRecvDummy: public ftDataRecv
|
||||
{
|
||||
public:
|
||||
|
||||
virtual ~ftDataRecvDummy() { return; }
|
||||
|
||||
/* Client Recv */
|
||||
virtual bool recvData(const std::string& peerId, const std::string& hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize, void *data);
|
||||
|
||||
/* Server Recv */
|
||||
virtual bool recvDataRequest(const std::string& peerId, const std::string& hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize);
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
virtual bool recvChunkMapRequest(const std::string& peer_id,const std::string& hash,
|
||||
bool is_client);
|
||||
|
||||
/* Send a chunk map */
|
||||
virtual bool recvChunkMap(const std::string& peer_id,const std::string& hash,
|
||||
const CompressedChunkMap& cmap,bool is_client);
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
virtual bool sendCRC32MapRequest(const std::string& peer_id,const std::string& hash);
|
||||
|
||||
/* Send a chunk map */
|
||||
virtual bool sendCRC32Map(const std::string& peer_id,const std::string& hash, const CompressedChunkMap& cmap);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -179,18 +179,3 @@ bool ftFileSearch::search(const std::string &hash, FileSearchFlags hintflags, Fi
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool ftSearchDummy::search(std::string /*hash*/, FileSearchFlags hintflags, FileInfo &/*info*/) const
|
||||
{
|
||||
/* remove unused parameter warnings */
|
||||
(void) hintflags;
|
||||
|
||||
#ifdef DEBUG_SEARCH
|
||||
std::cerr << "ftSearchDummy::search(" << hash ;
|
||||
std::cerr << ", " << hintflags << ");";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -51,14 +51,4 @@ class ftSearch
|
|||
|
||||
};
|
||||
|
||||
|
||||
class ftSearchDummy: public ftSearch
|
||||
{
|
||||
public:
|
||||
|
||||
ftSearchDummy() { return; }
|
||||
virtual ~ftSearchDummy() { return; }
|
||||
virtual bool search(std::string hash, FileSearchFlags hintflags, FileInfo &info) const;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue