From 3cbc75185f0e951753f522242539d95db2d037d8 Mon Sep 17 00:00:00 2001 From: sehraf Date: Wed, 22 Jun 2022 22:46:36 +0200 Subject: [PATCH 1/3] remove left over "exit -1;" --- src/serialiser/rstypeserializer.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/serialiser/rstypeserializer.h b/src/serialiser/rstypeserializer.h index 62930f99e..6e8ae925d 100644 --- a/src/serialiser/rstypeserializer.h +++ b/src/serialiser/rstypeserializer.h @@ -141,7 +141,6 @@ struct RsTypeSerializer << std::error_condition(std::errc::no_buffer_space) << std::endl; print_stacktrace(); - exit(-1); break; } memcpy(&member, ctx.mData + ctx.mOffset, sizeof(INTT)); From 91a7043082f0c27f11ebe16df4a674dc910aa180 Mon Sep 17 00:00:00 2001 From: sehraf Date: Wed, 22 Jun 2022 22:47:06 +0200 Subject: [PATCH 2/3] make sam encrypted leaseset aware --- src/services/autoproxy/p3i2psam3.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/services/autoproxy/p3i2psam3.cpp b/src/services/autoproxy/p3i2psam3.cpp index c9e77273e..99e5d457d 100644 --- a/src/services/autoproxy/p3i2psam3.cpp +++ b/src/services/autoproxy/p3i2psam3.cpp @@ -483,6 +483,8 @@ bool p3I2pSam3::startSession() // backup quantity params.push_back(i2p::makeOption("inbound.backupQuantity", + mSetting.inBackupQuantity)); params.push_back(i2p::makeOption("outbound.backupQuantity", + mSetting.outBackupQuantity)); + // lease set type (support encrypted one, too) + params.push_back("i2cp.leaseSetEncType=0,4"); } std::string paramsStr; From ddef65b0b041d37c44b7a157073bc53bdeabfc57 Mon Sep 17 00:00:00 2001 From: sehraf Date: Tue, 12 Jul 2022 23:25:33 +0200 Subject: [PATCH 3/3] silence warning during shutdown, since it is confusing and missleading (the error is expected when shutting down) --- src/services/autoproxy/rsautoproxymonitor.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/services/autoproxy/rsautoproxymonitor.cc b/src/services/autoproxy/rsautoproxymonitor.cc index b2d71571e..bf7a4d408 100644 --- a/src/services/autoproxy/rsautoproxymonitor.cc +++ b/src/services/autoproxy/rsautoproxymonitor.cc @@ -323,7 +323,8 @@ autoProxyService *rsAutoProxyMonitor::lookUpService(autoProxyType::autoProxyType if ((itService = mProxies.find(t)) != mProxies.end()) { return itService->second; } - RS_DBG("no service for type ", t, " found!"); + if (!mRSShutDown) + RS_DBG("no service for type ", t, " found!"); return NULL; }