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

added channel msg thumbnail, you'll lose all your current channel msgs before this rev

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3297 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2010-07-17 20:17:14 +00:00
parent 4157aff291
commit 1f873e023e
6 changed files with 78 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,7 @@ void RsChannelMsg::clear()
message.clear();
attachment.TlvClear();
thumbnail.TlvClear();
}
std::ostream &RsChannelMsg::print(std::ostream &out, uint16_t indent)
@ -65,6 +66,10 @@ std::ostream &RsChannelMsg::print(std::ostream &out, uint16_t indent)
out << "Attachment: " << std::endl;
attachment.print(out, int_Indent);
printIndent(out, int_Indent);
out << "Thumbnail: " << std::endl;
thumbnail.print(out, int_Indent);
printRsItemEnd(out, "RsChannelMsg", indent);
return out;
}
@ -84,6 +89,7 @@ uint32_t RsChannelSerialiser::sizeMsg(RsChannelMsg *item)
s += GetTlvWideStringSize(item->subject);
s += GetTlvWideStringSize(item->message);
s += item->attachment.TlvSize();
s += item->thumbnail.TlvSize();
return s;
}
@ -125,6 +131,9 @@ bool RsChannelSerialiser::serialiseMsg(RsChannelMsg *item, void *data, uint3
ok &= item->attachment.SetTlv(data, tlvsize, &offset);
std::cerr << "RsChannelSerialiser::serialiseMsg() Attachment: " << ok << std::endl;
ok &= item->thumbnail.SetTlv(data, tlvsize, &offset);
std::cerr << "RsChannelSerialiser::serialiseMsg() thumbnail: " << ok << std::endl;
if (offset != tlvsize)
{
ok = false;
@ -174,7 +183,9 @@ RsChannelMsg *RsChannelSerialiser::deserialiseMsg(void *data, uint32_t *pktsize)
/* RsChannelMsg */
ok &= GetTlvWideString(data, rssize, &offset, TLV_TYPE_WSTR_SUBJECT, item->subject);
ok &= GetTlvWideString(data, rssize, &offset, TLV_TYPE_WSTR_MSG, item->message);
ok &= item->attachment.GetTlv(data, rssize, &offset);
ok &= item->attachment.GetTlv(data, rssize, &offset);
ok &= item->thumbnail.GetTlv(data, rssize, &offset);
if (offset != rssize)
{