Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-06 18:15:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed a few bugs in new distant chat

Browse Source
This commit is contained in:
csoler 2015-11-30 20:51:47 -05:00
parent 81ab43beb9
commit 12866cd735
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/chat/distantchat.cc
View File

@ -157,6 +157,8 @@ void DistantChatService::receiveData(const RsGxsTunnelService::RsGxsTunnelId &tu
if(item != NULL) if(item != NULL)
{ {
item->PeerId(RsPeerId(tunnel_id)) ; // just in case, but normally this is already done.
handleIncomingItem(item) ; handleIncomingItem(item) ;
RsServer::notify()->notifyListChange(NOTIFY_LIST_PRIVATE_INCOMING_CHAT, NOTIFY_TYPE_ADD); RsServer::notify()->notifyListChange(NOTIFY_LIST_PRIVATE_INCOMING_CHAT, NOTIFY_TYPE_ADD);
} }

3
libretroshare/src/gxstunnel/p3gxstunnel.cc
View File

@ -896,6 +896,7 @@ void p3GxsTunnelService::handleRecvDHPublicKey(RsGxsTunnelDHPublicKeyItem *item)
pinfo.virtual_peer_id = vpid ; pinfo.virtual_peer_id = vpid ;
pinfo.direction = it->second.direction ; pinfo.direction = it->second.direction ;
pinfo.own_gxs_id = own_id ; pinfo.own_gxs_id = own_id ;
pinfo.to_gxs_id = item->signature.keyId; // this is already set for client side but not for server side.
// note: the hash might still be nn initialised on server side. // note: the hash might still be nn initialised on server side.
@ -1433,7 +1434,7 @@ bool p3GxsTunnelService::closeExistingTunnel(const RsGxsTunnelId& tunnel_id, uin
RsGxsTunnelStatusItem *cs = new RsGxsTunnelStatusItem ; RsGxsTunnelStatusItem *cs = new RsGxsTunnelStatusItem ;
cs->status = RS_GXS_TUNNEL_FLAG_CLOSING_DISTANT_CONNECTION; cs->status = RS_GXS_TUNNEL_FLAG_CLOSING_DISTANT_CONNECTION;
cs->PeerId(vpid) ; cs->PeerId(RsPeerId(tunnel_id)) ;
locked_sendEncryptedTunnelData(cs) ; // that needs to be done off-mutex and before we close the tunnel also ignoring failure. locked_sendEncryptedTunnelData(cs) ; // that needs to be done off-mutex and before we close the tunnel also ignoring failure.