From 093021ef997f7fbb44eff136490bc1c2a54280c5 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 2 Sep 2019 12:44:08 -0400 Subject: [PATCH 1/2] try fixing handover drop bug --- llarp/service/outbound_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llarp/service/outbound_context.cpp b/llarp/service/outbound_context.cpp index 2b6c708e7..9849921a2 100644 --- a/llarp/service/outbound_context.cpp +++ b/llarp/service/outbound_context.cpp @@ -135,7 +135,7 @@ namespace llarp util::memFn(&OutboundContext::HandleHiddenServiceFrame, this)); p->SetDropHandler(util::memFn(&OutboundContext::HandleDataDrop, this)); // we now have a path to the next intro, swap intros - if(p->Endpoint() == m_NextIntro.router && remoteIntro.router.IsZero()) + if(p->Endpoint() == m_NextIntro.router) SwapIntros(); } From 146d977945be73dc29b2bea8f9b716b1d613e863 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 2 Sep 2019 13:34:45 -0400 Subject: [PATCH 2/2] make osx unit tests compile on old gcc --- test/util/test_llarp_util_memfn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/util/test_llarp_util_memfn.cpp b/test/util/test_llarp_util_memfn.cpp index 96a7e342f..0f31df2ad 100644 --- a/test/util/test_llarp_util_memfn.cpp +++ b/test/util/test_llarp_util_memfn.cpp @@ -53,7 +53,7 @@ TYPED_TEST_SUITE_P(MemFnType); TYPED_TEST_P(MemFnType, Smoke) { - TypeParam foo; + TypeParam foo{}; ASSERT_TRUE(util::memFn(&Foo::constEmpty, foo)()); ASSERT_TRUE(util::memFn(&Foo::constEmpty, &foo)()); }