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

added the possibility to distant chat with unverified identities, while warning the user about it. Should help distant chatting.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-10-07 20:49:02 +00:00
parent ed44bc6884
commit e4e28c733c
10 changed files with 56 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -208,6 +208,9 @@ std::ostream& RsPrivateChatDistantInviteConfigItem::print(std::ostream &out, uin
printIndent(out, int_Indent);
out << "time of last hit: " << last_hit_time << std::endl;
printIndent(out, int_Indent);
out << "flags: " << flags << std::endl;
printRsItemEnd(out, "RsPrivateChatDistantInviteConfigItem", indent);
return out;
}
@ -432,6 +435,7 @@ uint32_t RsPrivateChatDistantInviteConfigItem::serial_size()
s += 16; /* aes_key */
s += 4; /* time_of_validity */
s += 4; /* last_hit_time */
s += 4; /* flags */
return s;
}
@ -849,6 +853,7 @@ bool RsPrivateChatDistantInviteConfigItem::serialise(void *data, uint32_t& pktsi
ok &= setRawUInt32(data, tlvsize, &offset, time_of_validity);
ok &= setRawUInt32(data, tlvsize, &offset, last_hit_time);
ok &= setRawUInt32(data, tlvsize, &offset, flags);
if (offset != tlvsize)
{
@ -1256,6 +1261,11 @@ RsPrivateChatDistantInviteConfigItem::RsPrivateChatDistantInviteConfigItem(void
ok &= getRawUInt32(data, rssize, &offset, &time_of_validity);
ok &= getRawUInt32(data, rssize, &offset, &last_hit_time);
if(offset+4 == rssize) // flags are optional for retro-compatibility.
ok &= getRawUInt32(data, rssize, &offset, &flags);
else
flags = 0 ;
#ifdef CHAT_DEBUG
std::cerr << "Building new chat msg config item." << std::endl ;
#endif