NetDB: Don't say we stored, and don't flood, if we're shutting down

This commit is contained in:
dg2-new
2015-06-20 10:06:54 +00:00
parent c6896c4418
commit 699d550992
2 changed files with 4 additions and 1 deletions

View File

@ -216,6 +216,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl {
// flood it
if (invalidMessage == null &&
getContext().netDb().floodfillEnabled() &&
!getContext().router().gracefulShutdownInProgress() &&
_message.getReplyToken() > 0) {
if (wasNew) {
// DOS prevention
@ -251,7 +252,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl {
TunnelId replyTunnel = _message.getReplyTunnel();
// A store of our own RI, only if we are not FF
DatabaseStoreMessage msg2;
if (getContext().netDb().floodfillEnabled() ||
if ((getContext().netDb().floodfillEnabled() && !getContext().router().gracefulShutdownInProgress()) ||
storedKey.equals(getContext().routerHash())) {
// don't send our RI if the store was our RI (from PeerTestJob)
msg2 = null;