Merge branch 'master' into qmlapp_pex_alpha

libretroshare/src/retroshare/rsgxschannels.h

@@ -60,6 +60,8 @@ public:
 
 public:
 	RsMsgMetaData mMeta;
+
+    std::set<RsGxsMessageId> mOlderVersions ;
 	std::string mMsg;  // UTF8 encoded.
 
 	std::list<RsGxsFile> mFiles;

libretroshare/src/retroshare/rsgxstrans.h

@@ -0,0 +1,103 @@
+#pragma once
+
+#include "retroshare/rstokenservice.h"
+#include "retroshare/rsgxsifacehelper.h"
+#include "retroshare/rsgxscommon.h"
+
+/// Subservices identifiers (like port for TCP)
+enum class GxsTransSubServices : uint16_t
+{
+	UNKNOWN         = 0x00,
+	TEST_SERVICE    = 0x01,
+	P3_MSG_SERVICE  = 0x02,
+	P3_CHAT_SERVICE = 0x03
+};
+
+/// Values must fit into uint8_t
+enum class GxsTransItemsSubtypes : uint8_t
+{
+	GXS_TRANS_SUBTYPE_MAIL    = 0x01,
+	GXS_TRANS_SUBTYPE_RECEIPT = 0x02,
+	GXS_TRANS_SUBTYPE_GROUP   = 0x03,
+	OUTGOING_RECORD_ITEM      = 0x04
+};
+
+enum class GxsTransSendStatus : uint8_t
+{
+	UNKNOWN                       = 0x00,
+	PENDING_PROCESSING            = 0x01,
+	PENDING_PREFERRED_GROUP       = 0x02,
+	PENDING_RECEIPT_CREATE        = 0x03,
+	PENDING_RECEIPT_SIGNATURE     = 0x04,
+	PENDING_SERIALIZATION         = 0x05,
+	PENDING_PAYLOAD_CREATE        = 0x06,
+	PENDING_PAYLOAD_ENCRYPT       = 0x07,
+	PENDING_PUBLISH               = 0x08,
+	/** This will be useful so the user can know if the mail reached at least
+	 * some friend node, in case of internet connection interruption */
+	//PENDING_TRANSFER,
+	PENDING_RECEIPT_RECEIVE       = 0x09,
+	/// Records with status >= RECEIPT_RECEIVED get deleted
+	RECEIPT_RECEIVED              = 0x0a,
+	FAILED_RECEIPT_SIGNATURE      = 0xf0,
+	FAILED_ENCRYPTION             = 0xf1
+};
+
+typedef uint64_t RsGxsTransId;
+
+class RsGxsTransGroup
+{
+	public:
+	RsGroupMetaData mMeta;
+};
+
+class RsGxsTransMsg
+{
+public:
+	RsGxsTransMsg() : size(0),data(NULL) {}
+	virtual ~RsGxsTransMsg() { free(data) ; }
+
+public:
+	RsMsgMetaData mMeta;
+
+	uint32_t size ;
+	uint8_t *data ;
+};
+
+struct RsGxsTransOutgoingRecord
+{
+	GxsTransSendStatus status;
+	RsGxsId recipient;
+	RsGxsTransId trans_id;
+
+	GxsTransSubServices client_service;
+
+	uint32_t data_size ;
+	Sha1CheckSum data_hash ;
+	uint32_t send_TS ;
+	RsGxsGroupId group_id ;
+};
+
+class RsGxsTrans: public RsGxsIfaceHelper
+{
+public:
+	class GxsTransStatistics
+	{
+	public:
+		GxsTransStatistics() {}
+
+		RsGxsGroupId prefered_group_id ;
+		std::vector<RsGxsTransOutgoingRecord> outgoing_records;
+	};
+
+	RsGxsTrans(RsGxsIface *gxs) : RsGxsIfaceHelper(gxs) {}
+
+	virtual ~RsGxsTrans() {}
+
+	virtual bool getStatistics(GxsTransStatistics& stats)=0;
+
+//	virtual bool getGroupData(const uint32_t &token, std::vector<RsGxsTransGroup> &groups) = 0;
+//	virtual bool getPostData(const uint32_t &token, std::vector<RsGxsTransMsg> &posts) = 0;
+};
+
+extern RsGxsTrans *rsGxsTrans ;

libretroshare/src/retroshare/rsinit.h

@@ -78,7 +78,7 @@ class RsInit
 		/*!
 		 * Setup Hidden Location;
 		 */
-		static bool 	SetHiddenLocation(const std::string& hiddenaddress, uint16_t port);
+		static void SetHiddenLocation(const std::string& hiddenaddress, uint16_t port, bool useBob);
 
 		static bool	LoadPassword(const std::string& passwd) ;
 

libretroshare/src/retroshare/rsnotify.h

@@ -228,6 +228,7 @@ class NotifyClient
 		virtual void notifyDiskFull                   (uint32_t           /* location  */, uint32_t                         /* size limit in MB */) {}
 		virtual void notifyPeerStatusChanged          (const std::string& /* peer_id   */, uint32_t                         /* status           */) {}
         virtual void notifyGxsChange                  (const RsGxsChanges& /* changes  */) {}
+		virtual void notifyConnectionWithoutCert      () {}
 
 		/* one or more peers has changed the states */
 		virtual void notifyPeerStatusChangedSummary   () {}