merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-03-29 14:18:05 +00:00
parent 0e6302ac6a
commit 1042744685
53 changed files with 2387 additions and 1904 deletions

View file

@ -458,11 +458,6 @@ class RsMsgItem: public RsMessageItem
public:
RsMsgItem() :RsMessageItem(RS_PKT_SUBTYPE_DEFAULT) {}
// RsMsgItem(uint16_t type)
// :RsItem(RS_PKT_VERSION_SERVICE, type,
// RS_PKT_SUBTYPE_DEFAULT)
// { setPriorityLevel(QOS_PRIORITY_RS_MSG_ITEM) ; }
virtual ~RsMsgItem() {}
virtual void clear();
@ -482,9 +477,13 @@ class RsMsgItem: public RsMessageItem
std::string subject;
std::string message;
RsTlvPeerIdSet msgto;
RsTlvPeerIdSet msgcc;
RsTlvPeerIdSet msgbcc;
RsTlvPeerIdSet rspeerid_msgto;
RsTlvPeerIdSet rspeerid_msgcc;
RsTlvPeerIdSet rspeerid_msgbcc;
RsTlvGxsIdSet rsgxsid_msgto;
RsTlvGxsIdSet rsgxsid_msgcc;
RsTlvGxsIdSet rsgxsid_msgbcc;
RsTlvFileSet attachment;
};