From 659a2aa002715d7c68b6628c0695fe84cca1ec30 Mon Sep 17 00:00:00 2001 From: Alexey Kasyanchuk Date: Mon, 24 Sep 2018 03:30:35 +0300 Subject: [PATCH] fix(config): fully disable p2p activity if option with p2p search disabled --- src/background/p2p.js | 10 ++++++++++ src/background/spider.js | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/background/p2p.js b/src/background/p2p.js index 02a6b33..3859076 100644 --- a/src/background/p2p.js +++ b/src/background/p2p.js @@ -51,6 +51,13 @@ class p2p { }); this.tcpServer.on('connection', (socket) => { + if(!config.p2p) + { + logT('p2p', 'ignore incoming p2p connection because of p2p disabled') + socket.destroy() + return + } + this.tcpServer.getConnections((err,con) => { logT('p2p', 'server connected', con, 'max', this.tcpServer.maxConnections) }) @@ -264,6 +271,9 @@ class p2p { add(address) { const { peers } = this + if(!config.p2p) + return + if(this.size > config.p2pConnections) return; diff --git a/src/background/spider.js b/src/background/spider.js index 9097275..a5d0d52 100644 --- a/src/background/spider.js +++ b/src/background/spider.js @@ -245,7 +245,7 @@ module.exports = function (send, recive, dataDirectory, version, env) }) let p2pBootstrapLoop = null - if(config.p2pBootstrap) + if(config.p2p && config.p2pBootstrap) { const loadBootstrapPeers = async (url) => { const json = await getServiceJson(url)