Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-13 08:35:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libretroshare/src/serialiser/rsmsgitems.h
View file

@ -28,6 +28,7 @@
#include <map>
#include "retroshare/rstypes.h"
#include "serialiser/rsserviceids.h"
#include "serialiser/rsserial.h"
#include "serialiser/rstlvtypes.h"
@ -308,11 +309,11 @@ class RsPrivateChatMsgConfigItem: public RsChatItem
virtual uint32_t serial_size() ; // deserialise is handled using a constructor
/* set data from RsChatMsgItem to RsPrivateChatMsgConfigItem */
void set(RsChatMsgItem *ci, const std::string &peerId, uint32_t confFlags);
void set(RsChatMsgItem *ci, const RsPeerId &peerId, uint32_t confFlags);
/* get data from RsPrivateChatMsgConfigItem to RsChatMsgItem */
void get(RsChatMsgItem *ci);
std::string configPeerId;
RsPeerId configPeerId;
uint32_t chatFlags;
uint32_t configFlags;
uint32_t sendTime;
@ -333,9 +334,9 @@ class RsPrivateChatDistantInviteConfigItem: public RsChatItem
virtual uint32_t serial_size() ; // deserialise is handled using a constructor
unsigned char aes_key[16] ;
std::string hash ;
RsFileHash hash ;
std::string encrypted_radix64_string ;
std::string destination_pgp_id ;
RsPgpId destination_pgp_id ;
uint32_t time_of_validity ;
uint32_t last_hit_time ;
uint32_t flags ;
@ -545,7 +546,7 @@ class RsMsgSrcId : public RsMessageItem
//
uint32_t msgId;
std::string srcId;
RsPeerId srcId;
};
class RsPublicMsgInviteConfigItem : public RsMessageItem
{