From patchwork Sat Mar 9 06:17:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 2139 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 2320988A76E for ; Fri, 8 Mar 2019 19:17:13 +0000 (GMT) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 44GHLb4kw5z5DSVq; Fri, 8 Mar 2019 19:17:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1552072631; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:list-id:list-unsubscribe:list-subscribe:list-post; bh=rlK9NTgvRBr1sD6OSlb3eWF+aNBD1lF8gKyEP/p4s4I=; b=GPyoDz2CRhonVo3z5qlnJ0AR+bztjwMuoNXCfSxVgc5VgX3QX71iSBlua0YDlfVhXRkg/u RnTvdP40H36zfeieEZKJoU+YosM1TAJXNZ9tBYMNL5puS5Pqw082tYh94wKWDtSzwniEqG 9RA7tryKxsUAxtlWnqVzPFzbHNr6IGsMJGR7Uo5AHMDTqmLQ77brm2JJDfJenalMhRt+Jf 5yzCsz6b8UzbJ012oU91Ytz5B0fxA1Ubo8ju4v4IqNPL2J14LXdq3BNRxhp315fk7/mqmS MS5VRbD+xwgkDg8Fav2YefpeL/aKYqNs/gOHF2zmrirkYSDRp1cD5RwNIA/Irg== Received: from [127.0.0.1] (unknown [65.19.167.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 44GHLW0RGBz5DSVk for ; Fri, 8 Mar 2019 19:17:06 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1552072628; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=rlK9NTgvRBr1sD6OSlb3eWF+aNBD1lF8gKyEP/p4s4I=; b=fAA+DIuzMyX5eE6HF5rUy+D5VZHbRMN4DaY2/B9ypQz44iFt1XBHmwsPOTRVuLLZNr8i8M 4Q1mTzvCPKevdPSuSLIFok2S1oylN+OCArusaZ0OA8+OgdgLTf/Sry1h0/TXwQsOfLOCxM Hi02mC1MhZiXzIB/S8ZaZQBMGlbas9O7F6wdq2HYHpRx9KS9ApwksYNiLLYvwJScgWLCea KHgc2pSgQ4aM93iDCH3W4crXQy5BPdvtwvZT0gLTG2STYg5ufq1MD8xyDEw5t79ihyD6np bIusMYvFkBeAhd9d7Vf3NH/ucCpXl8JE42ZBjVtxSfYA3YYqgmvcCyg8uoAjDw== To: "IPFire: Development-List" From: =?utf-8?q?Peter_M=C3=BCller?= Organization: IPFire.org Subject: [PATCH] Tor WebUI: drop relay bandwith options < 1 MBit/s Message-ID: Date: Fri, 08 Mar 2019 19:17:00 +0000 MIME-Version: 1.0 Content-Language: en-US X-Spamd-Result: default: False [-5.80 / 11.00]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; HAS_ORG_HEADER(0.00)[]; DKIM_SIGNED(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM(-2.70)[-0.900,0]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6939, ipnet:65.19.128.0/18, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=pmueller smtp.mailfrom=peter.mueller@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Tor requires at least 1 MBit/s in order to participate. Fixes #12001 Signed-off-by: Peter Müller --- html/cgi-bin/tor.cgi | 11 ++++------- lfs/tor | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index b17db01a2..71da66666 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team # +# Copyright (C) 2013-2019 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -36,10 +36,10 @@ my @dummy = ( ${Header::colouryellow} ); undef (@dummy); my @bandwidth_limits = ( - 1000 * 1024, # 1G + 1000 * 1024, # 1 GBit/s 500 * 1024, 200 * 1024, - 100 * 1024, # 100M + 100 * 1024, # 100 MBit/s 64 * 1024, 50 * 1024, 25 * 1024, @@ -49,10 +49,7 @@ my @bandwidth_limits = ( 8 * 1024, 4 * 1024, 2 * 1024, - 1024, # 1M - 512, - 256, - 160 + 1024 # 1 MBit/s ); my @accounting_periods = ('daily', 'weekly', 'monthly'); diff --git a/lfs/tor b/lfs/tor index 4e38a3e7c..384b1b213 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 33 +PAK_VER = 34 DEPS = ""