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

Lots of bugfixes and tweaks:

Browse source 
* Switched p3Ranking to share Friends Links as well as own.
 * Modified rankmsgs to contain source id.
 * Fixed up rsNotify, added pqiNotify and global function call to get it.
 * Added notify for Bad Incoming Directory
 * Added Emergency Incoming directory so RS can keep running.
 * Added notify for Bad Packet (connecting to V0.3.X)
 * Added notify for Incomplete Packet Read (not been triggered yet!)
 * added close() to BinInterface, close on pqissl calls reset() 
 * removed exit(1) calls from pqistreamer, replaced with bio->close().
 * Increased Maximum Packet Size for HTML messages.
 * Fixed Online/Offline Message Forwarding. (TEST).
 * Increased DHT bootstrap buckets to 4.
 * Cleaned up much of serialiser debug (was slowing down Mac)
 * Added directory path to File Listings.
 * added ConvertSharedFilePath() so correct local dir can be found.
 * Added ForceDirectoryCheck() and InDirectoryCheck() for file hashing.
 * removed old TMP cache loading.
 * switched off Cache debug.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-31 14:06:59 +00:00
parent a76baa5421
commit 5e41b21cef
36 changed files with 632 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libretroshare/src/serialiser/rsbaseitems.cc
View file

@ -27,7 +27,10 @@
#include "serialiser/rsbaseserial.h"
#include "serialiser/rsbaseitems.h"
/***
#define RSSERIAL_DEBUG 1
***/
#include <iostream>
/*************************************************************************/
@ -146,24 +149,25 @@ bool RsFileItemSerialiser::serialiseReq(RsFileRequest *item, void *data, uin
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsFileItemSerialiser::serialiseReq() Header: " << ok << std::endl;
std::cerr << "RsFileItemSerialiser::serialiseReq() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= setRawUInt64(data, tlvsize, &offset, item->fileoffset);
std::cerr << "RsFileItemSerialiser::serialiseReq() Fileoffset: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->chunksize);
std::cerr << "RsFileItemSerialiser::serialiseReq() Chunksize: " << ok << std::endl;
ok &= item->file.SetTlv(data, tlvsize, &offset);
std::cerr << "RsFileItemSerialiser::serialiseReq() FileItem: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsFileItemSerialiser::serialiseReq() Size Error! " << std::endl;
#endif
}
return ok;
@ -269,19 +273,22 @@ bool RsFileItemSerialiser::serialiseData(RsFileData *item, void *data, uint3
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsFileItemSerialiser::serialiseData() Header: " << ok << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= item->fd.SetTlv(data, tlvsize, &offset);
std::cerr << "RsFileItemSerialiser::serialiseData() TlvFileData: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsFileItemSerialiser::serialiseData() Size Error! " << std::endl;
#endif
}
return ok;
@ -453,23 +460,24 @@ bool RsCacheItemSerialiser::serialiseReq(RsCacheRequest *item, void *data, u
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsCacheItemSerialiser::serialiseReq() Header: " << ok << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= setRawUInt16(data, tlvsize, &offset, item->cacheType);
std::cerr << "RsCacheItemSerialiser::serialiseReq() cacheType: " << ok << std::endl;
ok &= setRawUInt16(data, tlvsize, &offset, item->cacheSubId);
std::cerr << "RsCacheItemSerialiser::serialiseReq() cacheSubId: " << ok << std::endl;
ok &= item->file.SetTlv(data, tlvsize, &offset);
std::cerr << "RsCacheItemSerialiser::serialiseReq() FileItem: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsFileItemSerialiser::serialiseReq() Size Error! " << std::endl;
#endif
}
return ok;
@ -580,23 +588,24 @@ bool RsCacheItemSerialiser::serialiseItem(RsCacheItem *item, void *data, uin
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsCacheItemSerialiser::serialiseItem() Header: " << ok << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= setRawUInt16(data, tlvsize, &offset, item->cacheType);
std::cerr << "RsCacheItemSerialiser::serialiseItem() cacheType: " << ok << std::endl;
ok &= setRawUInt16(data, tlvsize, &offset, item->cacheSubId);
std::cerr << "RsCacheItemSerialiser::serialiseItem() cacheSubId: " << ok << std::endl;
ok &= item->file.SetTlv(data, tlvsize, &offset);
std::cerr << "RsCacheItemSerialiser::serialiseItem() FileItem: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsFileItemSerialiser::serialiseItem() Size Error! " << std::endl;
#endif
}
return ok;

116
libretroshare/src/serialiser/rsconfigitems.cc
View file

@ -27,7 +27,10 @@
#include "serialiser/rsbaseserial.h"
#include "serialiser/rsconfigitems.h"
/***
#define RSSERIAL_DEBUG 1
***/
#include <iostream>
/*************************************************************************/
@ -166,43 +169,36 @@ bool RsFileTransferSerialiser::serialiseTransfer(RsFileTransfer *item, void
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() Header: " << ok << std::endl;
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= item->file.SetTlv(data, tlvsize, &offset);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() FileItem: " << ok << std::endl;
ok &= item->allPeerIds.SetTlv(data, tlvsize, &offset);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() allPeerIds: " << ok << std::endl;
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PEERID, item->cPeerId);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() cId: " << ok << std::endl;
ok &= setRawUInt16(data, tlvsize, &offset, item->state);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() State: " << ok << std::endl;
ok &= setRawUInt16(data, tlvsize, &offset, item->in);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() In/Out: " << ok << std::endl;
ok &= setRawUInt64(data, tlvsize, &offset, item->transferred);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() Transferred: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->crate);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() crate: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->trate);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() trate: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->lrate);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() lrate: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->ltransfer);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() ltransfer: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() Size Error! " << std::endl;
#endif
}
return ok;
@ -242,29 +238,19 @@ RsFileTransfer *RsFileTransferSerialiser::deserialiseTransfer(void *data, uint32
/* get mandatory parts first */
ok &= item->file.GetTlv(data, rssize, &offset);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() FileItem: " << ok << std::endl;
ok &= item->allPeerIds.GetTlv(data, rssize, &offset);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() allPeerIds: " << ok << std::endl;
/* string */
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PEERID, item->cPeerId);
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() cId: " << ok << std::endl;
/* data */
ok &= getRawUInt16(data, rssize, &offset, &(item->state));
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() State: " << ok << std::endl;
ok &= getRawUInt16(data, rssize, &offset, &(item->in));
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() In/Out: " << ok << std::endl;
ok &= getRawUInt64(data, rssize, &offset, &(item->transferred));
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() Transferred: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->crate));
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() crate: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->trate));
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() trate: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->lrate));
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() lrate: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->ltransfer));
std::cerr << "RsFileTransferSerialiser::serialiseTransfer() ltransfer: " << ok << std::endl;
if (offset != rssize)
{
@ -337,7 +323,9 @@ RsItem *RsGeneralConfigSerialiser::deserialise(void *data, uint32_t *pktsize)
(RS_PKT_CLASS_CONFIG != getRsItemClass(rstype)) ||
(RS_PKT_TYPE_GENERAL_CONFIG != getRsItemType(rstype)))
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGeneralConfigSerialiser::deserialise() Wrong Type" << std::endl;
#endif
return NULL; /* wrong type */
}
@ -400,20 +388,23 @@ bool RsGeneralConfigSerialiser::serialiseKeyValueSet(RsConfigKeyValueSet *it
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGeneralConfigSerialiser::serialiseKeyValueSet() Header: " << ok << std::endl;
std::cerr << "RsGeneralConfigSerialiser::serialiseKeyValueSet() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= item->tlvkvs.SetTlv(data, tlvsize, &offset);
std::cerr << "RsGeneralConfigSerialiser::serialiseKeyValueSet() kvs: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGeneralConfigSerialiser::serialiseKeyValueSet() Size Error! " << std::endl;
#endif
}
return ok;
@ -433,13 +424,17 @@ RsConfigKeyValueSet *RsGeneralConfigSerialiser::deserialiseKeyValueSet(void *dat
(RS_PKT_TYPE_GENERAL_CONFIG != getRsItemType(rstype)) ||
(RS_PKT_SUBTYPE_KEY_VALUE != getRsItemSubType(rstype)))
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGeneralConfigSerialiser::deserialiseKeyValueSet() Wrong Type" << std::endl;
#endif
return NULL; /* wrong type */
}
if (*pktsize < rssize) /* check size */
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGeneralConfigSerialiser::deserialiseKeyValueSet() Not Enough Space" << std::endl;
#endif
return NULL; /* not enough data */
}
@ -456,11 +451,13 @@ RsConfigKeyValueSet *RsGeneralConfigSerialiser::deserialiseKeyValueSet(void *dat
offset += 8;
/* get mandatory parts first */
ok &= item->tlvkvs.GetTlv(data, rssize, &offset),
std::cerr << "RsGeneralConfigSerialiser::deserialiseKeyValueSet() kvs: " << ok << std::endl;
ok &= item->tlvkvs.GetTlv(data, rssize, &offset);
if (offset != rssize)
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGeneralConfigSerialiser::deserialiseKeyValueSet() offset != rssize" << std::endl;
#endif
/* error */
delete item;
return NULL;
@ -468,7 +465,9 @@ RsConfigKeyValueSet *RsGeneralConfigSerialiser::deserialiseKeyValueSet(void *dat
if (!ok)
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGeneralConfigSerialiser::deserialiseKeyValueSet() ok = false" << std::endl;
#endif
delete item;
return NULL;
}
@ -531,7 +530,9 @@ RsItem *RsPeerConfigSerialiser::deserialise(void *data, uint32_t *pktsize)
(RS_PKT_CLASS_CONFIG != getRsItemClass(rstype)) ||
(RS_PKT_TYPE_PEER_CONFIG != getRsItemType(rstype)))
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsPeerConfigSerialiser::deserialise() Wrong Type" << std::endl;
#endif
return NULL; /* wrong type */
}
@ -630,35 +631,28 @@ bool RsPeerConfigSerialiser::serialiseNet(RsPeerNetItem *item, void *data, uint3
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsPeerConfigSerialiser::serialiseNet() Header: " << ok << std::endl;
std::cerr << "RsPeerConfigSerialiser::serialiseNet() Header: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PEERID, item->pid); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::serialiseNet() pid: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->netMode); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::serialiseNet() netMode: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->visState); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::serialiseNet() visState: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->lastContact); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::serialiseNet() lastContact: " << ok << std::endl;
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset, TLV_TYPE_IPV4_LOCAL, &(item->localaddr));
std::cerr << "RsPeerConfigSerialiser::serialiseNet() localaddr: " << ok << std::endl;
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset, TLV_TYPE_IPV4_REMOTE, &(item->remoteaddr));
std::cerr << "RsPeerConfigSerialiser::serialiseNet() remoteaddr: " << ok << std::endl;
if(offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsPeerConfigSerialiser::serialise() Size Error! " << std::endl;
#endif
}
return ok;
@ -698,22 +692,11 @@ RsPeerNetItem *RsPeerConfigSerialiser::deserialiseNet(void *data, uint32_t *size
/* get mandatory parts first */
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PEERID, item->pid); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::deserialiseNet() pid: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->netMode)); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::deserialiseNet() netMode: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->visState)); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::deserialiseNet() visState: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->lastContact)); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::deserialiseNet() lastContact: " << ok << std::endl;
ok &= GetTlvIpAddrPortV4(data, rssize, &offset, TLV_TYPE_IPV4_LOCAL, &(item->localaddr));
std::cerr << "RsPeerConfigSerialiser::deserialiseNet() localaddr: " << ok << std::endl;
ok &= GetTlvIpAddrPortV4(data, rssize, &offset, TLV_TYPE_IPV4_REMOTE, &(item->remoteaddr));
std::cerr << "RsPeerConfigSerialiser::deserialiseNet() remoteaddr: " << ok << std::endl;
if (offset != rssize)
{
@ -776,20 +759,23 @@ bool RsPeerConfigSerialiser::serialiseStun(RsPeerStunItem *item, void *data, uin
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsPeerConfigSerialiser::serialiseStun() Header: " << ok << std::endl;
std::cerr << "RsPeerConfigSerialiser::serialiseStun() Header: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= item->stunList.SetTlv(data, tlvsize, &offset); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::serialiseStun() stunList: " << ok << std::endl;
if(offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsPeerConfigSerialiser::serialiseStun() Size Error! " << std::endl;
#endif
}
return ok;
@ -829,7 +815,6 @@ RsPeerStunItem *RsPeerConfigSerialiser::deserialiseStun(void *data, uint32_t *si
/* get mandatory parts first */
ok &= item->stunList.GetTlv(data, rssize, &offset); /* Mandatory */
std::cerr << "RsPeerConfigSerialiser::deserialiseStun() stunList: " << ok << std::endl;
if (offset != rssize)
{
@ -936,8 +921,10 @@ bool RsCacheConfigSerialiser::serialise(RsItem *i, void *data, uint32_t *size)
ok &=setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsCacheConfigSerialiser::serialise() Header: " << ok << std::endl;
std::cerr << "RsCacheConfigSerialiser::serialise() Size: " << size << std::endl;
#endif
/* skip the header */
offset += 8;
@ -945,34 +932,20 @@ bool RsCacheConfigSerialiser::serialise(RsItem *i, void *data, uint32_t *size)
/* add the mandatory parts first */
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PEERID, item->pid);
std::cerr << "RsCacheConfigSerialiser::serialise() peerid: " << ok << std::endl;
ok &= setRawUInt16(data, tlvsize, &offset, item->cachetypeid);
std::cerr << "RsCacheConfigSerialiser::serialise() cacheTypeId: " << ok << std::endl;
ok &= setRawUInt16(data, tlvsize, &offset, item->cachesubid);
std::cerr << "RsCacheConfigSerialiser::serialise() cacheSubId: " << ok << std::endl;
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PATH, item->path);
std::cerr << "RsCacheConfigSerialiser::serialise() path: " << ok << std::endl;
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_NAME, item->name);
std::cerr << "RsCacheConfigSerialiser::serialise() name: " << ok << std::endl;
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_HASH_SHA1, item->hash);
std::cerr << "RsCacheConfigSerialiser::serialise() hash: " << ok << std::endl;
ok &= setRawUInt64(data, tlvsize, &offset, item->size);
std::cerr << "RsCacheConfigSerialiser::serialise() size: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->recvd);
std::cerr << "RsCacheConfigSerialiser::serialise() recvd: " << ok << std::endl;
if (offset !=tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsConfigSerialiser::serialisertransfer() Size Error! " << std::endl;
#endif
}
return ok;
@ -1012,28 +985,13 @@ RsItem *RsCacheConfigSerialiser::deserialise(void *data, uint32_t *size)
/* get mandatory parts first */
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PEERID, item->pid);
std::cerr << "RsCacheConfigSerialiser::deserialise() peerid: " << ok << std::endl;
ok &= getRawUInt16(data, rssize, &offset, &(item->cachetypeid));
std::cerr << "RsCacheConfigSerialiser::serialise() cacheTypeId: " << ok << std::endl;
ok &= getRawUInt16(data, rssize, &offset, &(item->cachesubid));
std::cerr << "RsCacheConfigSerialiser::serialise() cacheSubId: " << ok << std::endl;
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PATH, item->path);
std::cerr << "RsCacheConfigSerialiser::serialise() path: " << ok << std::endl;
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_NAME, item->name);
std::cerr << "RsCacheConfigSerialiser::serialise() name: " << ok << std::endl;
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_HASH_SHA1, item->hash);
std::cerr << "RsCacheConfigSerialiser::deserialise() hash: " << ok << std::endl;
ok &= getRawUInt64(data, rssize, &offset, &(item->size));
std::cerr << "RsCacheConfigSerialiser::deserialise() size: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->recvd));
std::cerr << "RsCacheConfigSerialiser::deserialise() recvd: " << ok << std::endl;
if (offset != rssize)

47
libretroshare/src/serialiser/rsdiscitems.cc
View file

@ -33,7 +33,10 @@
#include "serialiser/rstlvbase.h"
#include "serialiser/rstlvtypes.h"
/***
#define RSSERIAL_DEBUG 1
***/
#include <iostream>
/*************************************************************************/
@ -168,8 +171,10 @@ bool RsDiscSerialiser::serialiseItem(RsDiscItem *item, void *data, uint32_t
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::serialiseItem() Header: " << ok << std::endl;
std::cerr << "RsDiscSerialiser::serialiseItem() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
@ -177,19 +182,17 @@ bool RsDiscSerialiser::serialiseItem(RsDiscItem *item, void *data, uint32_t
/* add mandatory parts first */
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset,
TLV_TYPE_IPV4_LOCAL, &(item->laddr));
std::cerr << "RsDiscSerialiser::serialiseItem() laddress: " << ok << std::endl;
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset,
TLV_TYPE_IPV4_REMOTE, &(item->saddr));
std::cerr << "RsDiscSerialiser::serialiseItem() saddress: " << ok << std::endl;
ok &= setRawUInt16(data, tlvsize, &offset, item->contact_tf);
std::cerr << "RsDiscSerialiser::serialiseItem() contact_tf: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->discFlags);
std::cerr << "RsDiscSerialiser::serialiseItem() discFlags: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::serialiseItem() Size Error! " << std::endl;
#endif
}
return ok;
@ -208,13 +211,17 @@ RsDiscItem *RsDiscSerialiser::deserialiseItem(void *data, uint32_t *pktsize)
(RS_SERVICE_TYPE_DISC != getRsItemService(rstype)) ||
(RS_PKT_SUBTYPE_DISC_ITEM != getRsItemSubType(rstype)))
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::deserialiseItem() Wrong Type" << std::endl;
#endif
return NULL; /* wrong type */
}
if (*pktsize < rssize) /* check size */
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::deserialiseItem() Not Enough Space" << std::endl;
#endif
return NULL; /* not enough data */
}
@ -233,18 +240,16 @@ RsDiscItem *RsDiscSerialiser::deserialiseItem(void *data, uint32_t *pktsize)
/* get mandatory parts first */
ok &= GetTlvIpAddrPortV4(data, rssize, &offset,
TLV_TYPE_IPV4_LOCAL, &(item->laddr));
std::cerr << "RsDiscSerialiser::deserialiseItem() laddress: " << ok << std::endl;
ok &= GetTlvIpAddrPortV4(data, rssize, &offset,
TLV_TYPE_IPV4_REMOTE, &(item->saddr));
std::cerr << "RsDiscSerialiser::deserialiseItem() saddress: " << ok << std::endl;
ok &= getRawUInt16(data, rssize, &offset, &(item->contact_tf));
std::cerr << "RsDiscSerialiser::deserialiseItem() contact_tf: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->discFlags));
std::cerr << "RsDiscSerialiser::deserialiseItem() discFlags: " << ok << std::endl;
if (offset != rssize)
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::deserialiseItem() offset != rssize" << std::endl;
#endif
/* error */
delete item;
return NULL;
@ -252,7 +257,9 @@ RsDiscItem *RsDiscSerialiser::deserialiseItem(void *data, uint32_t *pktsize)
if (!ok)
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::deserialiseItem() ok = false" << std::endl;
#endif
delete item;
return NULL;
}
@ -336,8 +343,10 @@ bool RsDiscSerialiser::serialiseReply(RsDiscReply *item, void *data, uint32_
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::serialiseReply() Header: " << ok << std::endl;
std::cerr << "RsDiscSerialiser::serialiseReply() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
@ -345,26 +354,22 @@ bool RsDiscSerialiser::serialiseReply(RsDiscReply *item, void *data, uint32_
/* add mandatory parts first */
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset,
TLV_TYPE_IPV4_LOCAL, &(item->laddr));
std::cerr << "RsDiscSerialiser::serialiseReply() laddress: " << ok << std::endl;
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset,
TLV_TYPE_IPV4_REMOTE, &(item->saddr));
std::cerr << "RsDiscSerialiser::serialiseReply() saddress: " << ok << std::endl;
ok &= setRawUInt16(data, tlvsize, &offset, item->contact_tf);
std::cerr << "RsDiscSerialiser::serialiseReply() contact_tf: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->discFlags);
std::cerr << "RsDiscSerialiser::serialiseReply() discFlags: " << ok << std::endl;
ok &= SetTlvString(data, tlvsize, &offset,
TLV_TYPE_STR_PEERID, item->aboutId);
std::cerr << "RsDiscSerialiser::serialiseReply() aboutId: " << ok << std::endl;
ok &= item->certDER.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDiscSerialiser::serialiseReply() discFlags: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::serialiseReply() Size Error! " << std::endl;
#endif
}
return ok;
@ -383,13 +388,17 @@ RsDiscReply *RsDiscSerialiser::deserialiseReply(void *data, uint32_t *pktsize)
(RS_SERVICE_TYPE_DISC != getRsItemService(rstype)) ||
(RS_PKT_SUBTYPE_DISC_REPLY != getRsItemSubType(rstype)))
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::deserialiseReply() Wrong Type" << std::endl;
#endif
return NULL; /* wrong type */
}
if (*pktsize < rssize) /* check size */
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::deserialiseReply() pktsize != rssize" << std::endl;
#endif
return NULL; /* not enough data */
}
@ -408,25 +417,21 @@ RsDiscReply *RsDiscSerialiser::deserialiseReply(void *data, uint32_t *pktsize)
/* get mandatory parts first */
ok &= GetTlvIpAddrPortV4(data, rssize, &offset,
TLV_TYPE_IPV4_LOCAL, &(item->laddr));
std::cerr << "RsDiscSerialiser::deserialiseReply() laddress: " << ok << std::endl;
ok &= GetTlvIpAddrPortV4(data, rssize, &offset,
TLV_TYPE_IPV4_REMOTE, &(item->saddr));
std::cerr << "RsDiscSerialiser::deserialiseReply() saddress: " << ok << std::endl;
ok &= getRawUInt16(data, rssize, &offset, &(item->contact_tf));
std::cerr << "RsDiscSerialiser::deserialiseReply() contact_tf: " << ok << std::endl;
ok &= getRawUInt32(data, rssize, &offset, &(item->discFlags));
std::cerr << "RsDiscSerialiser::deserialiseReply() discFlags: " << ok << std::endl;
ok &= GetTlvString(data, rssize, &offset,
TLV_TYPE_STR_PEERID, item->aboutId);
std::cerr << "RsDiscSerialiser::deserialiseReply() aboutId: " << ok << std::endl;
ok &= item->certDER.GetTlv(data, rssize, &offset);
std::cerr << "RsDiscSerialiser::deserialiseReply() certDER: " << ok << std::endl;
if (offset != rssize)
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::deserialiseReply() offset != rssize" << std::endl;
#endif
/* error */
delete item;
return NULL;
@ -434,7 +439,9 @@ RsDiscReply *RsDiscSerialiser::deserialiseReply(void *data, uint32_t *pktsize)
if (!ok)
{
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::deserialiseReply() ok = false" << std::endl;
#endif
delete item;
return NULL;
}

13
libretroshare/src/serialiser/rsgameitems.cc
View file

@ -27,7 +27,10 @@
#include "serialiser/rsgameitems.h"
#include "serialiser/rstlvbase.h"
/***
#define RSSERIAL_DEBUG 1
***/
#include <iostream>
/*************************************************************************/
@ -103,31 +106,29 @@ bool RsGameSerialiser::serialiseItem(RsGameItem *item, void *data, uint32_t
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGameSerialiser::serialiseItem() Header: " << ok << std::endl;
std::cerr << "RsGameSerialiser::serialiseItem() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= setRawUInt32(data, tlvsize, &offset, item->serviceId);
std::cerr << "RsGameSerialiser::serialiseItem() serviceId: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->numPlayers);
std::cerr << "RsGameSerialiser::serialiseItem() numPlayers: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->msg);
std::cerr << "RsGameSerialiser::serialiseItem() msg: " << ok << std::endl;
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_GENID, item->gameId);
std::cerr << "RsGameSerialiser::serialiseItem() gameId: " << ok << std::endl;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_COMMENT, item->gameComment);
std::cerr << "RsGameSerialiser::serialiseItem() gameComment: " << ok << std::endl;
ok &= item->players.SetTlv(data, tlvsize, &offset);
std::cerr << "RsMsgSerialiser::serialiseItem() players: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsGameSerialiser::serialiseItem() Size Error! " << std::endl;
#endif
}
return ok;

23
libretroshare/src/serialiser/rsmsgitems.cc
View file

@ -28,7 +28,10 @@
#include "serialiser/rsmsgitems.h"
#include "serialiser/rstlvbase.h"
/***
#define RSSERIAL_DEBUG 1
***/
#include <iostream>
/*************************************************************************/
@ -90,24 +93,25 @@ bool RsChatSerialiser::serialiseItem(RsChatItem *item, void *data, uint32_t
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsChatSerialiser::serialiseItem() Header: " << ok << std::endl;
std::cerr << "RsChatSerialiser::serialiseItem() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= setRawUInt32(data, tlvsize, &offset, item->chatFlags);
std::cerr << "RsChatSerialiser::serialiseItem() chatFlags: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->sendTime);
std::cerr << "RsChatSerialiser::serialiseItem() sendTime: " << ok << std::endl;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_MSG, item->message);
std::cerr << "RsChatSerialiser::serialiseItem() Message: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsChatSerialiser::serialiseItem() Size Error! " << std::endl;
#endif
}
return ok;
@ -283,38 +287,33 @@ bool RsMsgSerialiser::serialiseItem(RsMsgItem *item, void *data, uint32_t *p
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsMsgSerialiser::serialiseItem() Header: " << ok << std::endl;
std::cerr << "RsMsgSerialiser::serialiseItem() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= setRawUInt32(data, tlvsize, &offset, item->msgFlags);
std::cerr << "RsMsgSerialiser::serialiseItem() msgFlags: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->sendTime);
std::cerr << "RsMsgSerialiser::serialiseItem() sendTime: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->recvTime);
std::cerr << "RsMsgSerialiser::serialiseItem() recvTime: " << ok << std::endl;
ok &= SetTlvWideString(data,tlvsize,&offset,TLV_TYPE_WSTR_SUBJECT,item->subject);
std::cerr << "RsMsgSerialiser::serialiseItem() Subject: " << ok << std::endl;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_MSG, item->message);
std::cerr << "RsMsgSerialiser::serialiseItem() Message: " << ok << std::endl;
ok &= item->msgto.SetTlv(data, tlvsize, &offset);
std::cerr << "RsMsgSerialiser::serialiseItem() MsgTo: " << ok << std::endl;
ok &= item->msgcc.SetTlv(data, tlvsize, &offset);
std::cerr << "RsMsgSerialiser::serialiseItem() MsgCC: " << ok << std::endl;
ok &= item->msgbcc.SetTlv(data, tlvsize, &offset);
std::cerr << "RsMsgSerialiser::serialiseItem() MsgBCC: " << ok << std::endl;
ok &= item->attachment.SetTlv(data, tlvsize, &offset);
std::cerr << "RsMsgSerialiser::serialiseItem() Attachment: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsMsgSerialiser::serialiseItem() Size Error! " << std::endl;
#endif
}
return ok;

9
libretroshare/src/serialiser/rsrankitems.cc
View file

@ -69,6 +69,7 @@ std::ostream &RsRankMsg::print(std::ostream &out, uint16_t indent)
void RsRankLinkMsg::clear()
{
rid.clear();
pid.clear();
timestamp = 0;
title.clear();
comment.clear();
@ -82,6 +83,8 @@ std::ostream &RsRankLinkMsg::print(std::ostream &out, uint16_t indent)
uint16_t int_Indent = indent + 2;
printIndent(out, int_Indent);
out << "rid: " << rid << std::endl;
printIndent(out, int_Indent);
out << "pid: " << pid << std::endl;
printIndent(out, int_Indent);
out << "timestamp: " << timestamp << std::endl;
@ -110,6 +113,7 @@ uint32_t RsRankSerialiser::sizeLink(RsRankLinkMsg *item)
{
uint32_t s = 8; /* header */
s += GetTlvStringSize(item->rid);
s += GetTlvStringSize(item->pid);
s += 4; /* timestamp */
s += GetTlvWideStringSize(item->title);
s += GetTlvWideStringSize(item->comment);
@ -143,6 +147,8 @@ bool RsRankSerialiser::serialiseLink(RsRankLinkMsg *item, void *data, uint32
/* add mandatory parts first */
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_GENID, item->rid);
std::cerr << "RsRankLinkSerialiser::serialiseLink() rid: " << ok << std::endl;
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PEERID, item->pid);
std::cerr << "RsRankLinkSerialiser::serialiseLink() pid: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->timestamp);
std::cerr << "RsRankLinkSerialiser::serialiseLink() timestamp: " << ok << std::endl;
@ -178,7 +184,7 @@ RsRankLinkMsg *RsRankSerialiser::deserialiseLink(void *data, uint32_t *pktsize)
if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) ||
(RS_SERVICE_TYPE_RANK != getRsItemService(rstype)) ||
(RS_PKT_SUBTYPE_RANK_LINK != getRsItemSubType(rstype)))
(RS_PKT_SUBTYPE_RANK_LINK2 != getRsItemSubType(rstype)))
{
return NULL; /* wrong type */
}
@ -200,6 +206,7 @@ RsRankLinkMsg *RsRankSerialiser::deserialiseLink(void *data, uint32_t *pktsize)
/* get mandatory parts first */
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_GENID, item->rid);
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PEERID, item->pid);
ok &= getRawUInt32(data, rssize, &offset, &(item->timestamp));
ok &= GetTlvWideString(data, rssize, &offset, TLV_TYPE_WSTR_TITLE, item->title);
ok &= GetTlvWideString(data, rssize, &offset, TLV_TYPE_WSTR_COMMENT, item->comment);

9
libretroshare/src/serialiser/rsrankitems.h
View file

@ -32,8 +32,9 @@
#include "serialiser/rsserial.h"
#include "serialiser/rstlvtypes.h"
const uint8_t RS_PKT_SUBTYPE_RANK_LINK = 0x02;
const uint8_t RS_PKT_SUBTYPE_RANK_PHOTO = 0x03;
const uint8_t RS_PKT_SUBTYPE_RANK_OLD_LINK = 0x02; /* defunct - don't use! */
const uint8_t RS_PKT_SUBTYPE_RANK_LINK2 = 0x03;
const uint8_t RS_PKT_SUBTYPE_RANK_PHOTO = 0x04;
/**************************************************************************/
@ -49,6 +50,7 @@ virtual void clear();
virtual std::ostream& print(std::ostream &out, uint16_t indent = 0);
std::string rid; /* Random Id */
std::string pid; /* Peer Id (cannot use RsItem::PeerId - as FoF transport!) */
uint32_t timestamp;
std::wstring title;
std::wstring comment;
@ -57,12 +59,13 @@ virtual std::ostream& print(std::ostream &out, uint16_t indent = 0);
/* Flags */
const uint32_t RS_LINK_TYPE_WEB = 0x0001;
const uint32_t RS_LINK_TYPE_OFF = 0x0002;
class RsRankLinkMsg: public RsRankMsg
{
public:
RsRankLinkMsg()
:RsRankMsg(RS_PKT_SUBTYPE_RANK_LINK) { return; }
:RsRankMsg(RS_PKT_SUBTYPE_RANK_LINK2) { return; }
virtual ~RsRankLinkMsg() { return; }
virtual void clear();
virtual std::ostream& print(std::ostream &out, uint16_t indent = 0);

11
libretroshare/src/serialiser/rsserial.cc
View file

@ -28,11 +28,13 @@
#include "serialiser/rsserial.h"
#include <map>
#include <iostream>
/***
#define RSSERIAL_DEBUG 1
***/
#ifdef RSSERIAL_DEBUG
#include <iostream>
#include <sstream>
#endif
@ -438,7 +440,12 @@ std::ostream &RsRawItem::print(std::ostream &out, uint16_t indent)
uint32_t getRsPktMaxSize()
{
return 65535; /* 2^16 */
//return 65535; /* 2^16 (old artifical low size) */
//return 1048575; /* 2^20 -1 (Too Big! - must remove fixed static buffers first) */
/* Remember that every pqistreamer allocates an input buffer of this size!
* So don't make it too big!
*/
return 262143; /* 2^18 -1 */
}