Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix key generation and cleanup

Browse Source
This commit is contained in:
sehraf 2020-11-28 11:32:53 +01:00
parent 27fa8a35b0
commit 911cbeb61a
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/services/autoproxy/p3i2psam3.cpp
View File

@ -506,10 +506,10 @@ bool p3I2pSam3::startSession()
if(!mSetting.address.privateKey.empty()) { if(!mSetting.address.privateKey.empty()) {
RS_DBG3("with destination"); RS_DBG3("with destination");
ret = sam3CreateSilentSession(session, SAM3_HOST_DEFAULT, SAM3_PORT_DEFAULT, mSetting.address.privateKey.c_str(), Sam3SessionType::SAM3_SESSION_STREAM, Sam3SigType::EdDSA_SHA512_Ed25519, paramsStr.c_str()); ret = sam3CreateSession(session, SAM3_HOST_DEFAULT, SAM3_PORT_DEFAULT, mSetting.address.privateKey.c_str(), Sam3SessionType::SAM3_SESSION_STREAM, Sam3SigType::EdDSA_SHA512_Ed25519, paramsStr.c_str());
} else { } else {
RS_DBG("without destination"); RS_DBG("without destination");
ret = sam3CreateSilentSession(session, SAM3_HOST_DEFAULT, SAM3_PORT_DEFAULT, SAM3_DESTINATION_TRANSIENT, Sam3SessionType::SAM3_SESSION_STREAM, Sam3SigType::EdDSA_SHA512_Ed25519, paramsStr.c_str()); ret = sam3CreateSession(session, SAM3_HOST_DEFAULT, SAM3_PORT_DEFAULT, SAM3_DESTINATION_TRANSIENT, Sam3SessionType::SAM3_SESSION_STREAM, Sam3SigType::EdDSA_SHA512_Ed25519, paramsStr.c_str());
} }
} }
@ -561,6 +561,7 @@ bool p3I2pSam3::startForwarding()
RS_STACK_MUTEX(mLockSam3Access); RS_STACK_MUTEX(mLockSam3Access);
mSetting.session->silent = true;
int ret = sam3StreamForward(mSetting.session, sockaddr_storage_iptostring(ps.localaddr).c_str(), sockaddr_storage_port(ps.localaddr)); int ret = sam3StreamForward(mSetting.session, sockaddr_storage_iptostring(ps.localaddr).c_str(), sockaddr_storage_port(ps.localaddr));
if (ret < 0) { if (ret < 0) {
RS_DBG("forward failed, due to", mSetting.session->error); RS_DBG("forward failed, due to", mSetting.session->error);
@ -686,6 +687,7 @@ void p3I2pSam3::establishConnection(taskTicket *ticket)
{ {
auto l = this->mLockSam3Access; auto l = this->mLockSam3Access;
RS_STACK_MUTEX(l); RS_STACK_MUTEX(l);
mSetting.session->silent = false;
connection = sam3StreamConnect(this->mSetting.session, wrapper->address.publicKey.c_str()); connection = sam3StreamConnect(this->mSetting.session, wrapper->address.publicKey.c_str());
} }