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

* Major tweak to the serialiser: shifted size to 32bits to handle bigger packets. This will break compatibility.

Browse source 
* Modified tlvitems to support future expansions.
 * added random tlv test functios.
 * added dummy Wide Directory functions to rsdir (for the future;)
 * Fixed Mutex Bug in fimonitor.
 * added netiface_test for hiberation / net change testing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1620 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-09-08 20:18:43 +00:00
parent 05676e4399
commit 0f99826623
19 changed files with 1588 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

70
libretroshare/src/serialiser/rstlvimage.cc
View file

@ -31,7 +31,7 @@
#include "serialiser/rsbaseserial.h"
/***
* #define TLV_FI_DEBUG 1
* #define TLV_IMG_DEBUG 1
**/
/************************************* RsTlvImage ************************************/
@ -49,9 +49,9 @@ void RsTlvImage::TlvClear()
}
uint16_t RsTlvImage::TlvSize()
uint32_t RsTlvImage::TlvSize()
{
uint32_t s = 4; /* header */
uint32_t s = TLV_HEADER_SIZE; /* header */
/* collect sizes for both uInts and data length */
s+= 4;
@ -63,21 +63,45 @@ uint16_t RsTlvImage::TlvSize()
bool RsTlvImage::SetTlv(void *data, uint32_t size, uint32_t *offset) /* serialise */
{
#ifdef TLV_IMG_DEBUG
std::cerr << "RsTlvImage::SetTlv()" << std::endl;
#endif
/* must check sizes */
uint16_t tlvsize = TlvSize();
uint32_t tlvsize = TlvSize();
uint32_t tlvend = *offset + tlvsize;
if (size < tlvend)
{
#ifdef TLV_IMG_DEBUG
std::cerr << "RsTlvImage::SetTlv() no space" << std::endl;
#endif
return false; /* not enough space */
}
bool ok = true;
/* start at data[offset] */
ok &= SetTlvBase(data, tlvend, offset, TLV_TYPE_IMAGE , tlvsize);
#ifdef TLV_IMG_DEBUG
if (!ok)
std::cerr << "RsTlvImage::SetTlv() NOK base" << std::endl;
#endif
/* add mandatory part */
ok &= setRawUInt32(data, tlvend, offset, image_type);
#ifdef TLV_IMG_DEBUG
if (!ok)
std::cerr << "RsTlvImage::SetTlv() NOK image" << std::endl;
#endif
ok &= binData.SetTlv(data, size, offset);
#ifdef TLV_IMG_DEBUG
if (!ok)
std::cerr << "RsTlvImage::SetTlv() NOK binData" << std::endl;
#endif
return ok;
@ -86,7 +110,10 @@ bool RsTlvImage::SetTlv(void *data, uint32_t size, uint32_t *offset) /* serialis
bool RsTlvImage::GetTlv(void *data, uint32_t size, uint32_t *offset) /* serialise */
{
if (size < *offset + 4)
#ifdef TLV_IMG_DEBUG
std::cerr << "RsTlvImage::GetTlv()" << std::endl;
#endif
if (size < *offset + TLV_HEADER_SIZE)
{
return false;
}
@ -96,10 +123,20 @@ bool RsTlvImage::GetTlv(void *data, uint32_t size, uint32_t *offset) /* serialis
uint32_t tlvend = *offset + tlvsize;
if (size < tlvend) /* check size */
{
#ifdef TLV_IMG_DEBUG
std::cerr << "RsTlvImage::GetTlv() FAIL no space" << std::endl;
#endif
return false; /* not enough space */
}
if (tlvtype != TLV_TYPE_IMAGE) /* check type */
{
#ifdef TLV_IMG_DEBUG
std::cerr << "RsTlvImage::GetTlv() FAIL wrong type" << std::endl;
#endif
return false;
}
bool ok = true;
@ -107,12 +144,33 @@ bool RsTlvImage::GetTlv(void *data, uint32_t size, uint32_t *offset) /* serialis
TlvClear();
/* skip the header */
(*offset) += 4;
(*offset) += TLV_HEADER_SIZE;
/* add mandatory parts first */
ok &= getRawUInt32(data, tlvend, offset, &(image_type));
ok &= binData.GetTlv(data, size, offset);
#ifdef TLV_IMG_DEBUG
if (!ok)
std::cerr << "RsTlvImage::GetTlv() NOK" << std::endl;
#endif
/***************************************************************************
* NB: extra components could be added (for future expansion of the type).
* or be present (if this code is reading an extended version).
*
* We must chew up the extra characters to conform with TLV specifications
***************************************************************************/
if (*offset != tlvend)
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvImage::GetTlv() Warning extra bytes at end of item";
std::cerr << std::endl;
#endif
*offset = tlvend;
}
return ok;
}