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

Fixed up the retroshare message system.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-02-04 17:55:13 +00:00
parent 07a458367b
commit 8527a5e53f
17 changed files with 947 additions and 609 deletions
Download patch file Download diff file Expand all files Collapse all files

43
libretroshare/src/services/p3service.cc
View file

@ -26,6 +26,8 @@
#include "pqi/pqi.h"
#include "services/p3service.h"
#define SERV_DEBUG 1
void p3Service::addSerialType(RsSerialType *st)
{
rsSerialiser->addSerialType(st);
@ -78,7 +80,10 @@ int p3Service::receive(RsRawItem *raw)
{
srvMtx.lock(); /***** LOCK MUTEX *****/
std::cerr << "p3Service::receive()" << std::endl;
#ifdef SERV_DEBUG
std::cerr << "p3Service::receive()";
std::cerr << std::endl;
#endif
/* convert to RsServiceItem */
uint32_t size = raw->getRawLength();
@ -86,11 +91,20 @@ int p3Service::receive(RsRawItem *raw)
if ((!item) || (size != raw->getRawLength()))
{
/* error in conversion */
#ifdef SERV_DEBUG
std::cerr << "p3Service::receive() Error" << std::endl;
std::cerr << "p3Service::receive() Size: " << size << std::endl;
std::cerr << "p3Service::receive() RawLength: " << raw->getRawLength() << std::endl;
#endif
if (item)
{
#ifdef SERV_DEBUG
std::cerr << "p3Service::receive() Bad Item:";
std::cerr << std::endl;
item->print(std::cerr, 0);
std::cerr << std::endl;
#endif
delete item;
}
}
@ -99,6 +113,13 @@ int p3Service::receive(RsRawItem *raw)
/* if we have something - pass it on */
if (item)
{
#ifdef SERV_DEBUG
std::cerr << "p3Service::receive() item:";
std::cerr << std::endl;
item->print(std::cerr, 0);
std::cerr << std::endl;
#endif
/* ensure PeerId is transferred */
item->PeerId(raw->PeerId());
recv_queue.push_back(item);
@ -126,10 +147,22 @@ RsRawItem *p3Service::send()
RsItem *si = send_queue.front();
send_queue.pop_front();
#ifdef SERV_DEBUG
std::cerr << "p3Service::send() Sending item:";
std::cerr << std::endl;
si->print(std::cerr, 0);
std::cerr << std::endl;
#endif
/* try to convert */
uint32_t size = rsSerialiser->size(si);
if (!size)
{
#ifdef SERV_DEBUG
std::cerr << "p3Service::send() ERROR size == 0";
std::cerr << std::endl;
#endif
/* can't convert! */
delete si;
srvMtx.unlock(); /***** UNLOCK MUTEX *****/
@ -139,12 +172,20 @@ RsRawItem *p3Service::send()
RsRawItem *raw = new RsRawItem(si->PacketId(), size);
if (!rsSerialiser->serialise(si, raw->getRawData(), &size))
{
#ifdef SERV_DEBUG
std::cerr << "p3Service::send() ERROR serialise failed";
std::cerr << std::endl;
#endif
delete raw;
raw = NULL;
}
if ((raw) && (size != raw->getRawLength()))
{
#ifdef SERV_DEBUG
std::cerr << "p3Service::send() ERROR serialise size mismatch";
std::cerr << std::endl;
#endif
delete raw;
raw = NULL;
}