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

Removed most of the output to stderr.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@641 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-07-09 09:55:09 +00:00
parent d5376cd575
commit ca69e3d5e3
24 changed files with 586 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libretroshare/src/serialiser/rsdistribitems.cc
View file

@ -234,41 +234,26 @@ bool RsDistribSerialiser::serialiseGrp(RsDistribGrp *item, void *data, uint3
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
std::cerr << "RsDistribSerialiser::serialiseGrp() Header: " << ok << std::endl;
std::cerr << "RsDistribSerialiser::serialiseGrp() Size: " << tlvsize << std::endl;
/* skip the header */
offset += 8;
/* RsDistribGrp */
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_GROUPID, item->grpId);
std::cerr << "RsDistribSerialiser::serialiseGrp() grpId: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->timestamp);
std::cerr << "RsDistribSerialiser::serialiseGrp() timestamp: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->grpFlags);
std::cerr << "RsDistribSerialiser::serialiseGrp() grpFlags: " << ok << std::endl;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_NAME, item->grpName);
std::cerr << "RsDistribSerialiser::serialiseGrp() grpName: " << ok << std::endl;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_COMMENT, item->grpDesc);
std::cerr << "RsDistribSerialiser::serialiseGrp() grpDesc: " << ok << std::endl;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_CATEGORY, item->grpCategory);
std::cerr << "RsDistribSerialiser::serialiseGrp() grpCategory: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->grpControlFlags);
std::cerr << "RsDistribSerialiser::serialiseGrp() grpControlFlags: " << ok << std::endl;
ok &= item->grpControlList.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseGrp() grpControlList: " << ok << std::endl;
ok &= item->grpPixmap.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseGrp() grpPixmap: " << ok << std::endl;
ok &= item->adminKey.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseGrp() adminKey: " << ok << std::endl;
ok &= item->publishKeys.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseGrp() publishKeys: " << ok << std::endl;
ok &= item->adminSignature.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseGrp() adminSignature: " << ok << std::endl;
if (offset != tlvsize)
{
@ -371,18 +356,13 @@ bool RsDistribSerialiser::serialiseGrpKey(RsDistribGrpKey *item, void *data,
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
std::cerr << "RsDistribSerialiser::serialiseGrpKey() Header: " << ok << std::endl;
std::cerr << "RsDistribSerialiser::serialiseGrpKey() Size: " << tlvsize << std::endl;
/* skip the header */
offset += 8;
/* RsDistribGrp */
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_GROUPID, item->grpId);
std::cerr << "RsDistribSerialiser::serialiseGrpKey() grpId: " << ok << std::endl;
ok &= item->key.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseGrpKey() key: " << ok << std::endl;
if (offset != tlvsize)
{
@ -477,30 +457,20 @@ bool RsDistribSerialiser::serialiseSignedMsg(RsDistribSignedMsg *item, void
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() Header: " << ok << std::endl;
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() Size: " << tlvsize << std::endl;
/* skip the header */
offset += 8;
/* RsDistribSignedMsg */
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_GROUPID, item->grpId);
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() grpId: " << ok << std::endl;
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_MSGID, item->msgId);
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() msgId: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->flags);
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() flags: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->timestamp);
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() timestamp: " << ok << std::endl;
ok &= item->packet.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() packet: " << ok << std::endl;
ok &= item->publishSignature.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() publishSignature: " << ok << std::endl;
ok &= item->personalSignature.SetTlv(data, tlvsize, &offset);
std::cerr << "RsDistribSerialiser::serialiseSignedMsg() personalSignature: " << ok << std::endl;
if (offset != tlvsize)
{

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

@ -147,34 +147,23 @@ bool RsRankSerialiser::serialiseLink(RsRankLinkMsg *item, void *data, uint32
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
std::cerr << "RsRankLinkSerialiser::serialiseLink() Header: " << ok << std::endl;
std::cerr << "RsRankLinkSerialiser::serialiseLink() Size: " << tlvsize << std::endl;
/* skip the header */
offset += 8;
/* 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;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_TITLE, item->title);
std::cerr << "RsRankLinkSerialiser::serialiseLink() Title: " << ok << std::endl;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_COMMENT, item->comment);
std::cerr << "RsRankLinkSerialiser::serialiseLink() Comment: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, *((uint32_t *) &(item->score)));
std::cerr << "RsRankLinkSerialiser::serialiseLink() timestamp: " << ok << std::endl;
ok &= setRawUInt32(data, tlvsize, &offset, item->linktype);
std::cerr << "RsRankLinkSerialiser::serialiseLink() linktype: " << ok << std::endl;
ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_LINK, item->link);
std::cerr << "RsRankLinkSerialiser::serialiseLink() Link: " << ok << std::endl;
if (offset != tlvsize)
{

2
libretroshare/src/serialiser/rstlvtypes.cc
View file

@ -270,7 +270,7 @@ bool RsTlvPeerIdSet::GetTlv(void *data, uint32_t size, uint32_t *offset) /*
if (size < tlvend) /* check size */
return false; /* not enough space */
std::cout << "yeah!!!" << std::endl;
if (tlvtype != TLV_TYPE_PEERSET) /* check type */
return false;