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

Enabled distant chat system.

Browse source 
Added system to collect and create chat invites from pgp keys.
Finished the GUI (some layouts need fixing, especially the link creation window).
Still needed: QoS on generic turtle data items. Will need a new item class for any anyway.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-06-16 14:39:44 +00:00
parent 94b78a8444
commit 69bf523c7a
18 changed files with 485 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/rsserver/p3msgs.cc
View file

@ -352,9 +352,13 @@ bool p3Msgs::getDistantChatInviteList(std::vector<DistantChatInviteInfo>& invite
{
return mChatSrv->getDistantChatInviteList(invites) ;
}
bool p3Msgs::initiateDistantChatConnexion(const std::string& encrypted_str,std::string& hash,uint32_t& error_code)
bool p3Msgs::initiateDistantChatConnexion(const std::string& encrypted_str,time_t validity_time,std::string& hash,uint32_t& error_code)
{
return mChatSrv->initiateDistantChatConnexion(encrypted_str,hash,error_code) ;
return mChatSrv->initiateDistantChatConnexion(encrypted_str,validity_time,hash,error_code) ;
}
bool p3Msgs::initiateDistantChatConnexion(const std::string& hash,uint32_t& error_code)
{
return mChatSrv->initiateDistantChatConnexion(hash,error_code) ;
}
bool p3Msgs::getDistantChatStatus(const std::string& hash,uint32_t& status,std::string& pgp_id)
{
@ -364,4 +368,8 @@ bool p3Msgs::closeDistantChatConnexion(const std::string& hash)
{
return mChatSrv->closeDistantChatConnexion(hash) ;
}
bool p3Msgs::removeDistantChatInvite(const std::string& hash)
{
return mChatSrv->removeDistantChatInvite(hash) ;
}

4
libretroshare/src/rsserver/p3msgs.h
View file

@ -189,9 +189,11 @@ class p3Msgs: public RsMsgs
virtual bool createDistantChatInvite(const std::string& pgp_id,time_t time_of_validity,std::string& encrypted_string) ;
virtual bool getDistantChatInviteList(std::vector<DistantChatInviteInfo>& invites);
virtual bool initiateDistantChatConnexion(const std::string& encrypted_string,std::string& hash,uint32_t& error_code) ;
virtual bool initiateDistantChatConnexion(const std::string& encrypted_string,time_t validity_time,std::string& hash,uint32_t& error_code) ;
virtual bool initiateDistantChatConnexion(const std::string& hash,uint32_t& error_code) ;
virtual bool getDistantChatStatus(const std::string& hash,uint32_t& status,std::string& pgp_id) ;
virtual bool closeDistantChatConnexion(const std::string& hash) ;
virtual bool removeDistantChatInvite(const std::string& hash) ;
private: