From 3f4c1a1baf90e694890a42cbf9972f9fc0807054 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 22 Feb 2014 20:26:12 +0000 Subject: [PATCH] bug fixing git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7143 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/rsserver/p3peers.cc | 8 +++++--- .../src/serialiser/rsdiscovery2items.cc | 2 +- libretroshare/src/services/p3chatservice.cc | 18 +++++++++--------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc index fdef2f9dd..ffeb338d6 100644 --- a/libretroshare/src/rsserver/p3peers.cc +++ b/libretroshare/src/rsserver/p3peers.cc @@ -547,15 +547,17 @@ bool p3Peers::gpgSignData(const void *data, const uint32_t len, unsigned char return AuthGPG::getAuthGPG()->SignDataBin(data,len,sign,signlen); } -bool p3Peers::getGPGDetails(const PGPIdType &id, RsPeerDetails &d) +bool p3Peers::getGPGDetails(const PGPIdType &pgp_id, RsPeerDetails &d) { #ifdef P3PEERS_DEBUG - std::cerr << "p3Peers::getPgpDetails() called for id : " << id << std::endl; + std::cerr << "p3Peers::getPgpDetails() called for id : " << pgp_id << std::endl; #endif /* get from mAuthMgr */ - bool res = AuthGPG::getAuthGPG()->getGPGDetails(id, d); + bool res = AuthGPG::getAuthGPG()->getGPGDetails(pgp_id, d); + d.isOnlyGPGdetail = true ; + d.service_perm_flags = mPeerMgr->servicePermissionFlags(pgp_id) ; return res ; } diff --git a/libretroshare/src/serialiser/rsdiscovery2items.cc b/libretroshare/src/serialiser/rsdiscovery2items.cc index 3dfe7a164..323278a79 100644 --- a/libretroshare/src/serialiser/rsdiscovery2items.cc +++ b/libretroshare/src/serialiser/rsdiscovery2items.cc @@ -819,7 +819,7 @@ RsDiscContactItem *RsDiscSerialiser::deserialiseContact(void *data, uint32_t *pk /* get mandatory parts first */ ok &= item->pgpId.deserialise(data, rssize, offset) ; - ok &= item->pgpId.deserialise(data, rssize, offset) ; + ok &= item->sslId.deserialise(data, rssize, offset) ; ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_LOCATION, item->location); ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_VERSION, item->version); diff --git a/libretroshare/src/services/p3chatservice.cc b/libretroshare/src/services/p3chatservice.cc index 15e87e6b8..40e36ffb8 100644 --- a/libretroshare/src/services/p3chatservice.cc +++ b/libretroshare/src/services/p3chatservice.cc @@ -3642,21 +3642,21 @@ void p3ChatService::cleanDistantChatInvites() DistantChatPeerId p3ChatService::virtualPeerIdFromHash(const TurtleFileHash& hash) { - if(DistantChatPeerId::SIZE_IN_BYTES < Sha1CheckSum::SIZE_IN_BYTES) + if(DistantChatPeerId::SIZE_IN_BYTES > Sha1CheckSum::SIZE_IN_BYTES) std::cerr << __PRETTY_FUNCTION__ << ": Serious inconsistency error." << std::endl; - - unsigned char tmp[DistantChatPeerId::SIZE_IN_BYTES] ; - memset(tmp,0,DistantChatPeerId::SIZE_IN_BYTES) ; - memcpy(tmp,Sha1CheckSum(hash).toByteArray(),Sha1CheckSum::SIZE_IN_BYTES) ; - return DistantChatPeerId(tmp) ; + return DistantChatPeerId(hash.toByteArray()) ; } TurtleFileHash p3ChatService::hashFromVirtualPeerId(const DistantChatPeerId& pid) { - if(DistantChatPeerId::SIZE_IN_BYTES < Sha1CheckSum::SIZE_IN_BYTES) + if(DistantChatPeerId::SIZE_IN_BYTES > Sha1CheckSum::SIZE_IN_BYTES) std::cerr << __PRETTY_FUNCTION__ << ": Serious inconsistency error." << std::endl; - - return Sha1CheckSum(pid.toByteArray()); + + unsigned char tmp[Sha1CheckSum::SIZE_IN_BYTES] ; + memset(tmp,0,Sha1CheckSum::SIZE_IN_BYTES) ; + memcpy(tmp,pid.toByteArray(),DistantChatPeerId::SIZE_IN_BYTES) ; + + return Sha1CheckSum(tmp); } bool p3ChatService::getDistantChatInviteList(std::vector& invites) {