From 4fdd9feddc9a9221b3d2788da1c143e4861b7bff Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 14 Jul 2016 16:59:26 -0400 Subject: [PATCH] don't try to republish forever --- Destination.cpp | 4 ++-- NetDb.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Destination.cpp b/Destination.cpp index abfe3227..6e6d880f 100644 --- a/Destination.cpp +++ b/Destination.cpp @@ -459,7 +459,7 @@ namespace client // "this" added due to bug in gcc 4.7-4.8 [s,this](std::shared_ptr leaseSet) { - if (leaseSet && s->m_LeaseSet) + if (leaseSet) { // we got latest LeasetSet LogPrint (eLogDebug, "Destination: published LeaseSet verified for ", GetIdentHash().ToBase32()); @@ -470,7 +470,7 @@ namespace client else LogPrint (eLogWarning, "Destination: couldn't find published LeaseSet for ", GetIdentHash().ToBase32()); // we have to publish again - s->Publish (); + s->Publish (); }); } } diff --git a/NetDb.h b/NetDb.h index 3b54ae4c..bc7e8e7b 100644 --- a/NetDb.h +++ b/NetDb.h @@ -31,12 +31,7 @@ namespace data const int NETDB_INTRODUCEE_EXPIRATION_TIMEOUT = 65*60; const int NETDB_MIN_EXPIRATION_TIMEOUT = 90*60; // 1.5 hours const int NETDB_MAX_EXPIRATION_TIMEOUT = 27*60*60; // 27 hours - -#ifdef MESHNET - const int NETDB_PUBLISH_INTERVAL = 60; -#else const int NETDB_PUBLISH_INTERVAL = 60*40; -#endif class NetDb {