From patchwork Mon Jun 28 15:22:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 30759 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B168627BC81; Mon, 28 Jun 2021 16:25:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 37EE527BC78 for ; Mon, 28 Jun 2021 16:25:44 +0100 (BST) Received: from localhost ([::1]:60286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxt8p-0006WC-AT for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 11:25:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt8A-0005bh-5k for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxt89-0006p0-U7 for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxt89-0001nb-RL for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49254] [PATCH 1/4] gnu: Add wondershaper. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 15:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49254@debbugs.gnu.org Cc: Aljosha Papsch X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16248938546795 (code B ref -1); Mon, 28 Jun 2021 15:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jun 2021 15:24:14 +0000 Received: from localhost ([127.0.0.1]:52259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7N-0001lX-Ns for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:44960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7K-0001lO-F5 for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7J-0004aG-Jf for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:10 -0400 Received: from mail-fr2deu01on2130.outbound.protection.outlook.com ([40.107.135.130]:29345 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7G-0006GA-HL for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XNbIDLfFA/5t2ubq4puxtyGDZmDnq7l6XrRwcbcIXnXHDhEMGNJmx3r3YwZgR+xylhl2H4vlE8J4Q089Gfuylhruk121B38JmZu42ecyTdzn7y3MfEJUQK9lpUN3ukxiWSrM7vPdTiRxDFlnjld6WXriqbt+hnFeMTTDA+OKzchPSGPnCOWKhqy4OlABwH+g/QtH4VU3K7fqKeJ/LLB41K6SJH0M13wke3LMAcvjGMTkElRru4NCbBMtU34rEHbRA+WX5fwww7clfZlOQdPRjBYTjbTEJYHl67L4pwkyw25ZJD2zsMsUxjQUd184KHmkNHlUu/IoSf0zDiNGWnE93A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TT/O1aTfTJqprUzpvFf3YSxblPkjXFZuh/nGwxSCURU=; b=h4/gbmdU6if5YR7gJVZio6lH3inEqMEAowPJirDyc4vyZQSgLgvGjvT4b6SkNyXvmxz53+qJul54+gdIo3YfI3B4jwYErQHIFxq7MyGNVhPMBnawSw1tvsh8htJMo0ue8sORM9dk090Pm7aaf0F+YCEUsZkyBtIdwELFyfa8USB38fg9KewQ+KY3YBpWi/ah0xRCUTi934eZ7jV19VZ0cfmYkwwdptCBIRTJCU4IZYPnf6u+nMEhMF/4kjJo9vtwWS2r3KSTrnl0oA1IAKMz60mUOAWIo4y9fd38yroWt4vo1ljocrVMXJlXBCXU5EwHIh2y0pwMt8TCMJdB5LSMmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TT/O1aTfTJqprUzpvFf3YSxblPkjXFZuh/nGwxSCURU=; b=3h57mWR6BPgkVELUSCbkovBMOd+kueZyT0307NrADjrWmWKRYnSQ99Hs+FiyVF1BfsXwW8+KdmvWxhaLJBOvAaWCoEkjVpSlSdcfdRkbP1kpUw/ci+ojTgmHbP8El/ZVcJiOzhjowWQla9AIzXmAJx+eP6VOfnVQRkIConXiZarhpMDHmJnPh0sPnG6vdBMttV0DsqfaFFFMo2UITHp2+UJs1URw5xE1+OwSOOp3XnbYOsMk98jzD27oqKPNzzjGkIZD30Fw5+Pa+3wPiN+nmytNmBfKFK5sTjkmSSBLknuXNE22Q1kuaT3n1/C/3On+6GMoMvt59X67KvcaAn2NCw== Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BE0P281MB0211.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.17; Mon, 28 Jun 2021 15:24:03 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%7]) with mapi id 15.20.4287.021; Mon, 28 Jun 2021 15:24:03 +0000 From: Aljosha Papsch Date: Mon, 28 Jun 2021 17:22:29 +0200 Message-Id: <20210628152232.31073-2-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210628152232.31073-1-ep@stern-data.com> References: <20210628152232.31073-1-ep@stern-data.com> X-ClientProxiedBy: PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Mon, 28 Jun 2021 15:24:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c4b35d1-e326-4039-e038-08d93a48c33a X-MS-TrafficTypeDiagnostic: BE0P281MB0211: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:182; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l7FPak5fIJj1CbEZMcaaYMG7CQCh4HiyC+jHL7099JUxyI/3m+kYPT0ua12S1dsz8sjiSy2Ygb06Wrgy92SE5PX0UFYJVkFmaF275G9jmQnkHF8E4DdbrI/ZbFComDuMigxG01fwjbuMaQRY+fowW6/Yypt/QUUsksTVfMchAGNVNPXwI+SWBaaqxaRTWQAOhBdsfQPsyawp38f3fsSpg0+FOBiavW6NpktDQk9yEjex0JiOLepNJZli6AwKdfvMm/z9QJ9r7tWNiTvKahqJZykOI2mBzUtkYPCfqRIpGw1EsbXO/hZBndO9gA/67eKEmjfSdiXiGC1n0/moKtyzyP2UrKuhU2DCOazsqje2V0obRKHOFi24Yv7GF7B5eLuAl5duDofp6tDSmfFf4BCyQkCskoQnOYakUo6zed2l/Av2yHPZKRUxu32XgWSaoU6mbgquraqC/9LNLmDKXl0n1Tlru9zBQ5vp9cWLQG3JDE3WymaLAg0uLnhs0gP5GjngOhXgd1edx6Z/UEx+YXMvUWwiWWwZOw0k7AfvYQ8AoDR8Lvp57KzKQk99SNFGyZIpxORkiWqFmY2W5ZJF47VMgEB7jWPdIo8TLChsA4X6NHYs31IKgonT6nMrguW9vM0k1QG4V8wqEeIbJgEzGV/fi13xGf1SBrVXp9hfmekGhV2OX3yPBNf9/LEUigeQ8RjjtCvmgJg4/8U1gg9dbedKq8hFbT2/6+KxLtYvoANhq1Xag9dRRA0HG3DW5eOQgtlz+/pi/xA2djomVMqLEYbwEw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(366004)(376002)(136003)(39830400003)(52116002)(107886003)(83380400001)(8676002)(6666004)(186003)(66574015)(478600001)(2906002)(86362001)(8936002)(6512007)(6506007)(6916009)(36756003)(4326008)(2616005)(316002)(38100700002)(5660300002)(6486002)(1076003)(66946007)(66556008)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K1LjRMA03jQOU7se/7F3Q9VylX2uDQStQ67jdoqOqZwklx2DOl9CbDTtlXGK6nXhT3OYHo0uDJSb44ixMk+Og0paNwpU2YnLmuqXmOM5/UkagixYzfJ7UIU4/KBve4IvYWA5E7e6qRPygfJUTPffjxcrfHf25aolONFf0SPppcJ9tiK1T21FBMxeOucwbaPOy+DxW0jHaG0drGJOPyLCXRjzIsHZlELsAHv39vq1i0UHWBkqn6upwpYsax/J69Z7TeQIyWWA3zL1mYnZbzFjaf2xM6RTrYDbb5CBJuSv0hk362ANxJa0IpE0MGG18e+qW/s7nGguYV16x1nnT3UaK9jWSqxbBpROcB2eJpBh5MuYrHrkcyN2BYU2D35zmEAx1SaFhtL5iEloR3+504OJ3WPzGF0tbp7YwQ65yUIAm4Qqqk+dqpD8QsEEZQzk6/Oswj7gHC5gVzs0h9EUWS/u1iSzThVmoLPcDqYs5E71QGTWjdRo0s2n3cEbAqOv070Ft5AZrGAhJOL/MGxkzkfEQgtGI1LEV8QcbbIpGAs7zgmadaoWXx8yelJdO9fS1oiLbRqAj3o+3lju2AmYj+b8iXzx7pSucF2bK5zcl1rQc0JqaHen5kqCDiKr3yURKoi1e1Y3P9atAXk6/jxNW4QXRpoIzrjkD0nUNjjAyA81kVZAOqpweYTAnzcVdii7Y+wLacwsMOQoR4Hnr3XmaOLInWvOwXWSUs1V7Gu+uNgk6DPDMCDXuI21jXYYdii7a3n/moaFlX9rKZ4NsBR8d62nYx+J6d+H62+UrloiTJVUn4jmoovan+xWlzMlBubRkUKgDKkIwmCBf6TXjBEPBss8DNer6kpZDXWEZxgIg0A8g6twjC7rqvgAsVIbG0Uf++le6Uu/Y0LJIujqubj61tjO1JYMK5Ac1Q83ISDOx95EawbNY78CgA321G8Ev1/EeAMrdSPS5h0hZQDbJphYk3XtJi/OzbeVFHe9jQJIJbPqy40MYsKHAhAL9nj2Rcwtv1vp6NN+i6MIvJDeE3dQQZIPIHIhYPmVNUs7xdUI4IfNguoum4B6x2m7IB9m1dIIiwNtISPf/CDE7Wb0M+UayJtoWoQxmQIs56f2XqNZGcTQlNbfbJ7qGzkIfikLnKS6CTlxgsAIgI2jN8EACdt0+CQC93dOykPi/erd9bARXziLqcEszZF6agq6rKXDqlkpFQ1XhJCeAiAd8bKdKVvQKNdnKocIAG8Xi7gsW83p40G7ddvsdy8jeINYRhvva47kB9XOACnlMWBVbpKvoCI62Ou/iHOa7Oo3p9QwrA9nk2IlwmDYN/4G+hVBB3NhZAfH7c4Lfs16IHdzFPil7O7xdrqUjslKgSqUxJCwxOui4ZSeNDeFE0VHtqnp7OBHzLuE8Zgp X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c4b35d1-e326-4039-e038-08d93a48c33a X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 15:24:03.8252 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JCsP1BhJ1RABgkUywEWdSsbvtKiphVS2CaxCIpQlCHBQcNHhHMnCXORsydF2npNbapcahjGw8/DhWR5ykJLkXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE0P281MB0211 Received-SPF: pass client-ip=40.107.135.130; envelope-from=ep@stern-data.com; helo=DEU01-FR2-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (wondershaper): New variable. --- gnu/packages/networking.scm | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 82c7a0161a..7374ad5dbc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -65,6 +65,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -4196,3 +4197,47 @@ IPv6 Internet connectivity - it also works over IPv4.") ;; version. This exception does not (and cannot) modify any license terms ;; which apply to the Application, with which you must still comply license:lgpl3))) + +(define-public wondershaper + (package + (name "wondershaper") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/apapsch/wondershaper") + (commit "0987dbb0c360184b8aacf391646e19ea9ee78b10"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hyivkpvr5pv8wg64i7vgpxib4allbp4v1ahp3qhc1d88rkw7gjs")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("./wondershaper" "./bin/")) + #:phases + (modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-invoked-commands + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (substitute* (string-append bin "/wondershaper") + (("^\\s*ip ") + (string-append (which "ip") " ")) + (("^\\s*modprobe ") + (string-append (which "modprobe") " ")) + (("^\\s*tc ") + (string-append (which "tc") " ")))) + #t))))) + (inputs + `(("iproute2" ,iproute) + ("kmod" ,kmod))) + (synopsis "Command-line utility for limiting an adapter's bandwidth") + (description "Wonder Shaper allows the user to limit the bandwidth of one +or more network adapters. It does so by using iproute's tc command, but +greatly simplifies its operation. Wonder Shaper was first released by Bert +Hubert in 2002. A subsequent release added a command-line interface. Wonder +Shaper makes use of tc's Hierarchical Token Bucket (HTB) queue, ensuring good +bandwidth management on high speed (above ten megabits) links.") + (home-page "https://github.com/magnific0/wondershaper") + (license license:gpl2))) From patchwork Mon Jun 28 15:22:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 30758 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B811227BC81; Mon, 28 Jun 2021 16:25:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1EE7E27BC78 for ; Mon, 28 Jun 2021 16:25:18 +0100 (BST) Received: from localhost ([::1]:59272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxt8P-0005q2-2x for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 11:25:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt8A-0005db-RN for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxt8A-0006pj-JR for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxt8A-0001np-HO for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49255] [PATCH 2/4] gnu: Add wondershaper service. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 15:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49255 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49255@debbugs.gnu.org Cc: Aljosha Papsch X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16248938586812 (code B ref -1); Mon, 28 Jun 2021 15:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jun 2021 15:24:18 +0000 Received: from localhost ([127.0.0.1]:52263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7S-0001lo-1F for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:45074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7O-0001le-Hw for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7N-0004fC-Vw for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:14 -0400 Received: from mail-fr2deu01on2139.outbound.protection.outlook.com ([40.107.135.139]:33476 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7L-0006J0-E2 for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L+znygubRFhsHpVMHr2NrVYMmmEXLG1wfjX2smwHkxQn5Zl1+N/lA5JfOWfHNpEMT8H1c5Q36NUsfIbCrCoR3NvKnwU/s5oeUY2A23iPL/L7cFw8ljr4knHg/h520Opsfs1KzjACU+BvDYD/zO1ZOVhVAzxenp+QmYtt1es+8N8prHAc2MrTo8zb+mQxYzRc09Lf48huxDGZNhUlQZulxpCPMgfM83XM0fUXpxE1oK2ZQ7D/aOeyT35KBd6D8kQOh6oUUQ98prfnCFTJVNi75Z8wmdp6FgU4yOXRJDImdqqna8mHR50n5/Rsw2HWOckW4GG8YONdB8LsbdEloqOqxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mbxgRyGG5tAFet5ohonPgDlV5l2PqrdmLdenvWm6wnA=; b=QpmihW6qhmW5/bWfS3G6LobFv8xJbFBCBdAk1HASwJe+8WkvDzDa3fpkfJfdM154xCn95FN7wwW3oQKxy9ppyCesPbRU22jpKqwOzIl8Yjf4JZJ2iEtLOV51uNsakQftfcKEqsHRiGXfv0Nj4uwJlOrWvkxm8i3VWl+gt86i0IBHAlYeYMFTJZAez5cQEckktKiGyA3Ycg4/3XmCyNYTdZvRKpF+3LRRQ4dAZTDX+Yddg/+kxbbsLrLKApzz8u0IMN/lExrr+xw2Qnz3uS0nJ9Kjnzko8xgonPKjovM239lmT0/xcTPczjUSX1bzPo+vZicxoRy2w53ZxbSpywa5ZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mbxgRyGG5tAFet5ohonPgDlV5l2PqrdmLdenvWm6wnA=; b=Z1BFHmsmYMdz6XuaaviTclU6sSN36OBR5Yk3dSPhIxe7NuNAG4ikLSmnDXgJ0XNqm1X4qhLxYnsBbA3zv9qAZXo8Bi8sStWkYeqayKd6gODd0bMcQBcZAqYZMyMX4XBX44zNSgsC79cpgtcgYGEYBX0Pdf2E9CidXhzUORggUqhGoGRaKIC0YkbxFQU7TAkWpxddXfjATMItUgw7J5KK7DYpU957VTRAzFNbuvTVamnsxLKcY2uFvyGWaZPUwy2UwSAzRuseJDNvimCHSuOuk45yawJRGuW56XZMuokm9ZrGL+gZR97tU8q70Sr1fiJ0TT1FNifo4NA59REKgR6kTg== Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BE0P281MB0211.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.17; Mon, 28 Jun 2021 15:24:09 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%7]) with mapi id 15.20.4287.021; Mon, 28 Jun 2021 15:24:09 +0000 From: Aljosha Papsch Date: Mon, 28 Jun 2021 17:22:30 +0200 Message-Id: <20210628152232.31073-3-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210628152232.31073-1-ep@stern-data.com> References: <20210628152232.31073-1-ep@stern-data.com> X-ClientProxiedBy: PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Mon, 28 Jun 2021 15:24:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff305126-d42b-4e41-dbdd-08d93a48c6be X-MS-TrafficTypeDiagnostic: BE0P281MB0211: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xBFvwaIBlxDPRD6FbtgfBS+dog2DMFvvShJZCswKjhndZQHLEolME/a/EgW8vSyG5iEOS1Izwe6/N1bxZ4rTGrRPOFaWMbT0pMCpUQJz/gyVF3v//JK++31flwAqbNxMLHF4d11/WB482s97RGJWfz+lRQ5S7IYkzwZLOMY8Z5c+MCMn7ZuCITB3PJ1KFEvJDUCFJsv6pAYXhtKeigpsrGsCHtDeEOzY8OCcrZPXmJE1r6FxMACasz3wusk8o+GSCyxACgi9K200+4RMmiwOqFqHMW7Cj9pw6yOtJn036KHhnDZW1ZN1FAVisb5LVg+pZYhc2xkqhXGvs6GMFlgC/5oSa8N+7hEa/mgoXywTxWgkRTjHODn3yiQI3aHsNQM5NOl/GITaKlkyhZ4lj/RjpfJhpWy4ELOnlJ8SXqRpBgaMdZqMMt/RUHBYGD/n39/gCqKPNbEUEAzVAfb3tBMHjOPCEeM8bMfEl+bijvM3oakH+xIgc7QVvOTERKYCcB4BPKSFlz57/q51FP54sAWzW4eKoi4XxCBuO7QUd49kInKhMfjZwvv2qBXdRyb1ymv5jPymi+FW1f7zgW2MIj/XjZ+oRLeI6Bx2E5bu6TA7Cy1+O8zqAfGxHtNQod554lLwZ+fGWtk6mSjflnou9UMnRMV1B3VbMeUph8n9RhBkkgTRyP0GRwWtpFf3OORSTbRDPOKQsILwSQ0BVViSFpWA8aBsSl8sTQ2mk7shoe216qNgoNycU7Y09pwQ8o5+m5ddBVVTUasVprkGN20cS6LrxQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(366004)(376002)(136003)(39830400003)(52116002)(107886003)(83380400001)(8676002)(6666004)(186003)(478600001)(2906002)(86362001)(8936002)(6512007)(6506007)(6916009)(36756003)(4326008)(2616005)(316002)(38100700002)(5660300002)(6486002)(1076003)(66946007)(66556008)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2YKryd35edvsJiKMcCWVNQqk38rDklxy2WopxIf9kldZwEOQ+bphuj7sYpuQ2QqPrnPDovLVgI1+nTEyqq9ErsCxC3UiYBHy29De6EYy8/8X8vf+dYCWvsFtXiLCJTGu4VPmfpw/Ov6/UEov1vQz5PcXV66V43U5uTOFw1dC0fEom0m5/F3UQvV3ou3p22mBVDj2FMYQMPDNvqg62TJqUB/pLTIYCf0D64PoLLNXGmPIsEH5i+KFaIlZ7ZQ1B2zAwX4+MGC+uYT32w+J//FV+exG66tnAGqyDPzsUE+9T20YLXLpvvQhPZbwZDhKXZttfidXu7ZrjFRsyVXprZS1VJxwftBQb2FcLAb1pi/PZdyjhLc6NRlsBxxtOusdtQHOawHZY1cb/zlaOF7uD3fPaeHuF23ETwDnzoe065ynte3ZIjgqbRBH9GyNfIqAdEcDkafjd5CPyc1hciIroFIB6E0L8V4Fs0TVyeTlIGkwdkPH7N63XWCiBjbVbgLR95pIiTBnSJThG2wQ/T2FjvMKVqxDdWR7cd4EMWH6Q1PYR8qhjvQy0UicLDZkkfKhT6U2UQISOxJ2yFQKs/FzPEGDOIJCEz2zm2twTVxJVWmMYMq2SSjAgyxlTzVV7HQbvxDgmH5b9JgKaBtDwj4ExRBuntsvOEGOs45PdMU2GBNyoKTqeok1HxGRRloBqjF0ffdFkbFjFMvZCGoOxpSxOtgbVpPDAnDfy031c44Qe6xhwDvYoADANH9c6VKZCqRj1yz8VYs/D8NhsLf9RwDND4I/d4xd9AGdWzaZP21gjppe9O68fuhoJJoOGFotQOu/3gnmuYTsmIKFFAVHMH4YyiOIOFXOS0gdF1yp+z9O7VIh0fmnbun1FbZoXpLX8UiSbvYdfQEz2/7YcHK//6d8G59CH5Vbt6Ye6vbdpjlmdFip/flsRamrlp2rjSMCKDaX8kczEbmVuf9MLZSDl0Q4+6T/cvtHXos2x0EEbYJJCFvpiz1BFxKXv39LjIclL44yoiNvpjlPEqEpyPr4OgrH7N9iGP9+cRjwK3sqTaRw9jkF7pa5ujgg/8+PBGfYW4GeQbsIW4fHm54OOe8FLH1hqESgeynDTOYDTp3aiNjnGZetX9ZFIQdr2a2YIT+st56GxxMNM93+88SaH8OiitMb8S9+BreX5rQfE3V4WOfLSGmyaH6yF488d6OzxSwrvhEGOjglR19pLu19W5wMfmL2S9PlCp/D5N+78xh5uC2/9qQQT7ZZXcZlNJyLGJ2kukmaPoRbwgwujtiX0cF9OcH4tCGM029m/Zpe0BI2F+vLWZb/JsmaBrfH9qp8EG5RHEx0MKz5hbLoSBIwi5unVw81WguT2r7fsEG/5rFyKMFCNAhE/MoxRfr4CKkqZWJIo6ZxwkZu X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff305126-d42b-4e41-dbdd-08d93a48c6be X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 15:24:09.7154 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EDebUwS4YCAFMYz5FuXvnqor4jvHBSZnOmPENW1UO0Utn1zOw2yv84fIDW8RdcS9y9MEjbBJQo1Rb7gtO93+/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE0P281MB0211 Received-SPF: pass client-ip=40.107.135.139; envelope-from=ep@stern-data.com; helo=DEU01-FR2-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm (wondershaper-configuration): New symbol. Configuration for wondershaper-service-type. * gnu/services/networking.scm (wondershaper-configuration?): New symbol. Predicate for wondershaper-configuration. * gnu/services/networking.scm (wondershaper-service-type): New symbol. One-shot service running wondershaper with a generated config file. --- gnu/services/networking.scm | 107 +++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 87b3d754a3..a17f41aa30 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -221,7 +221,11 @@ keepalived-configuration keepalived-configuration? - keepalived-service-type)) + keepalived-service-type + + wondershaper-configuration + wondershaper-configuration? + wondershaper-service-type)) ;;; Commentary: ;;; @@ -2190,4 +2194,105 @@ of the IPFS peer-to-peer storage network."))) "Run @uref{https://www.keepalived.org/, Keepalived} routing software."))) + +;;; +;;; Wondershaper +;;; + +(define %wondershaper-default-download-speed 2048) + +(define-record-type* + wondershaper-configuration make-wondershaper-configuration + wondershaper-configuration? + (wondershaper wondershaper-configuration-wondershaper ; + (default wondershaper)) + (interface wondershaper-configuration-interface ;string + (default "eth0")) + (download-speed wondershaper-configuration-download-speed ;number (kbps) + (default %wondershaper-default-download-speed)) + (upload-speed wondershaper-configuration-upload-speed ;number (kbps) + (default 512)) + (prio-3-rate wondershaper-configuration-prio-3-rate ;number (kbps) + (default (/ (* 20 %wondershaper-default-download-speed) 100))) + (prio-3-ceil wondershaper-configuration-prio-3-ceil + (default (/ (* 90 %wondershaper-default-download-speed) 100))) + (high-prio-dest wondershaper-configuration-high-prio-dest ;list of ip addresses + (default '())) + (no-prio-host-src wondershaper-configuration-no-prio-host-src ;list of ip addresses + (default '())) + (no-prio-host-dest wondershaper-configuration-no-prio-host-dest ;list of ip addresses + (default '())) + (no-prio-port-src wondershaper-configuration-no-prio-port-src ;list of port numbers + (default '())) + (no-prio-port-dest wondershaper-configuration-no-prio-port-dest ;list of port numbers + (default '()))) + +(define wondershaper-config-file + (match-lambda + (($ _ interface download-speed + upload-speed prio-3-rate prio-3-ceil high-prio-dest + no-prio-host-src no-prio-host-dest + no-prio-port-src no-prio-port-dest) + (begin + (define (shell-quote str) + "Return STR wrapped in single quotes, with every single quote in the string escaped." + (let ((quote-char (lambda (chr) + (if (eq? chr #\') + "'\\''" + (string chr))))) + (string-append + "'" + (let loop ((chars (string->list str)) + (result "")) + (match chars + (() result) + ((head tail ...) + (loop tail + (string-append result + (quote-char head)))))) + "'"))) + (define (list->bash-array lst) + (string-append "(" (string-join (map shell-quote lst)) ")")) + (define (format-config) + (string-append + "IFACE=" (shell-quote interface) " +DSPEED=\"" (number->string download-speed) "\" +USPEED=\"" (number->string upload-speed) "\" +PRIO_3_RATE=\"" (number->string prio-3-rate) "\" +PRIO_3_CEIL=\"" (number->string prio-3-ceil) "\" +HIPRIODST=" (list->bash-array high-prio-dest) " +NOPRIOHOSTSRC=" (list->bash-array no-prio-host-src) " +NOPRIOHOSTDST=" (list->bash-array no-prio-host-dest) " +NOPRIOPORTSRC=" (list->bash-array (map number->string no-prio-port-src)) " +NOPRIOPORTDST=" (list->bash-array (map number->string no-prio-port-dest)) " +")) + (computed-file + "wondershaper.conf" + #~(call-with-output-file #$output + (lambda (port) + (display "# Generated by wondershaper-service\n" port) + (display #$(format-config) port)))))))) + +(define (wondershaper-shepherd-service config) + (match config + (($ wondershaper) + (list (shepherd-service + (provision '(wondershaper)) + (documentation "Configure traffic control") + (requirement '(networking)) + (start #~(lambda _ + (invoke #$(file-append wondershaper "/bin/wondershaper") + "-p" "-f" #$(wondershaper-config-file config)))) + (one-shot? #t)))))) + +(define wondershaper-service-type + (service-type + (name 'wondershaper) + (extensions + (list (service-extension shepherd-root-service-type + wondershaper-shepherd-service))) + (default-value (wondershaper-configuration)) + (description "Run @uref{https://github.com/magnific0/wondershaper, +wondershaper}, a small utility script setting up traffic control (tc)."))) + ;;; networking.scm ends here From patchwork Mon Jun 28 15:22:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 30761 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CDB6A27BC81; Mon, 28 Jun 2021 16:25:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 46E2027BC78 for ; Mon, 28 Jun 2021 16:25:51 +0100 (BST) Received: from localhost ([::1]:60744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxt8w-0006oj-Cb for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 11:25:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt8B-0005fR-Kc for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxt8B-0006qz-8e for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxt8B-0001o4-6Y for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49256] [PATCH 3/4] guix.texi: Document wondershaper-service-type. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 15:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49256 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49256@debbugs.gnu.org Cc: Aljosha Papsch X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16248938636836 (code B ref -1); Mon, 28 Jun 2021 15:25:03 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jun 2021 15:24:23 +0000 Received: from localhost ([127.0.0.1]:52269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7W-0001m6-FF for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:45200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7T-0001lw-5X for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7S-0004k0-UV for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:18 -0400 Received: from mail-fr2deu01on2103.outbound.protection.outlook.com ([40.107.135.103]:22583 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7Q-0006NH-KK for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OOqLTibUATGGuDiWL5ULco/dR7Y8aiYZaNkndXmtKRX/ZfmONsm6Ul58R/ZAUC0R3cBNlpMab0TEoIRYxuC2F7aaZiRaU/SWHGmUGyXPJYs72szsofMX9yKkIbW26ttCiRkZfQsnh5uteHlmlCWKpEDs/xSBHynDeygSeqFTtwWXoRkAUE6TaUv/Ez0nZ/H19sDbWqGMUwoZPAcB7tTtMVhHI/QmXi89/6LhjfIHuLVo9Pr8zEtYnahwfaQ1f4+/shGIPfDUpCaz0tUl+I+tptMyXEeki0ksypCnYk7QlQKAbF172WewdGw5elLPDWbBrssSrKzmOdYkBwHKCkbbfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SdVwBZFSEt00ckIOY3S8Do+zEbjYedG7MN3DB+XT7Kw=; b=cpxWvNs182GVdYLMhA0ESHQzkbrcfQs/mhXnfAiI/T50aUfLDAnol0GXiHXZ0771eWEAlBSN8mlREgt+xE45BXReeeu837NHAd4DNEyF74XowXgXTUGN2n2hd+l16i/jvoIsWmf3RmAvfRtE+o+PxZQduUsb/xLEaU03fkbxiCWc76hXB6mcB6wJ8UuHxMU1t6qdqhJo6Y00CKSDLzALWfT05IHWMEIBp4xMWoGyXgJRvSI2fBIwOEC6X9CmhR0KS8pEdk622+sVw5udIS4gOLcnfS2+J0vwzbQGYXnzzzO8zQ3c/zfp8e35hVFlWE8dMIGTa0qsUul6ZTurDV1oMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SdVwBZFSEt00ckIOY3S8Do+zEbjYedG7MN3DB+XT7Kw=; b=E2S3e8UiynD8fpy9jRhiACMI3oerdSr1ONLTAZrG2FuANDDHkB+pWw160CJCB5iOgAHzzIfdoTnBhnPj2am2WG+Q+MRprAcULrZEBYWS2S8pRS6SL3cdtHGnNGvy2gvLz4EjjJSJd5NlqDRwAor4aJ7YmRDrvY7CYfVqrJuEvhpSBBNLU7J62NztFgIcakd+xgHxlvh9TcVDAsELu8p9LZrx+EwJYGHs2RJzHCqGNxEEMDRiiKFJKJtuqYddVNd8mJJ7/J2rgMZ3cifdf/akDvQfJaiIX5jDO45BUkD2guoSZo9l66TaVjnwxjViC8YL4vCnfzpOI+v5KzIBWF6vVQ== Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BE0P281MB0211.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.17; Mon, 28 Jun 2021 15:24:14 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%7]) with mapi id 15.20.4287.021; Mon, 28 Jun 2021 15:24:14 +0000 From: Aljosha Papsch Date: Mon, 28 Jun 2021 17:22:31 +0200 Message-Id: <20210628152232.31073-4-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210628152232.31073-1-ep@stern-data.com> References: <20210628152232.31073-1-ep@stern-data.com> X-ClientProxiedBy: PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Mon, 28 Jun 2021 15:24:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f673c639-7712-495c-26a4-08d93a48c9bd X-MS-TrafficTypeDiagnostic: BE0P281MB0211: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rbLMTc2+12cI3VImv71be0d85deaDhJXuBLisg4RC6aZoBwuYOWXLHbQVgf2iSwNmdWC3gGmpZGyMARpGkfvbNBhaDjndxAJq7wImrOK0QquXpKoC/MUFamnQVLzQgs3URyK12ez4IdkC85LaU8BrlCpxNoAWvvk19lkzwYvnjsEFbyq09Q0EKcJsjzWNbYN3w9LN0TVQkjtyiSv4jQ84leVNtDLZ2xBllHEfX7cZEtyZhWL5RGFt9OHzHy4PXi2OJvvKthPKViO6usvf1mIfcbJVE6g8gKTuQP4pbsgVF5G17y6VnskrU7XQGU3ApJ9N3uwn9jO2SYBl9i+xhjVqE91Pw0NzkXooEr9uhz/3C6VWptpQY9CvK/kCP9fXTC0uTA+Z38MuyGdm06hC8YRHEwxxfFBw/vSNjs1q0B9p/s/BlFMtlMsNnnXofjhXFu/X56d9osVBkK0s7ppcPACfbtws5jQTVfnnrJntWyvhPyV18UwqhFx5WqQ7H8aajx6pTFemWLDiYN2DN5QCV80cB6jbueMmatMUgFUl+uVdRucc8qM6NXcjJwZPGa6FGtvZ2L4tfWKlspNpJnnBkET9yxPBHlO1hzCBuXk6TzHTs4eBy+UgDJoryhMbC52wn76mPdoJJn31H4OoEkOGzC37BxMZ96bt8iVpsPpTsJ5QingA/4mJE9MR7l662AjHTMIis4o1nYV5lRXX/n0XgWsFPiuElQtzCxI1IknoDvQ71Z4Qz/aH0sJ3wwL0+yZ7cqNJU/WQV3LQK2HI9oEu7gCQQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(366004)(376002)(136003)(39830400003)(52116002)(107886003)(83380400001)(8676002)(6666004)(186003)(478600001)(2906002)(86362001)(8936002)(6512007)(6506007)(6916009)(36756003)(4326008)(2616005)(316002)(38100700002)(5660300002)(6486002)(1076003)(66946007)(66556008)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IAwztACiJJ6SrTytKxKHN7UbIaNPOtDfTPuh/1j021YKok6aC2O06oLAXz07hHyY7xog30VlbxfgfIxlozeBihG6+vjENBSvKSBnenM9q6frbIydyagdBgZsINV79UuGGkfDAqD6tIE71t7U7aaNRYM8Q+fKJw1QFMN1X0uvjG7b/qPSwMmmBF4ManOAo0w6KJafYgneNLYevkxtGb3c8eZ7Szlt3aG6GOWJShRkYSGyAMHD2fFnLpM2cPe5SRtLlQjfPzE1OWBCp0NUfZ0bs9yVt8RK2w0SbR98Vf9TR8ucfw5n2OFdyCnswFUMFlSP8tMMCZ7qzxPca3Svu9ZFV+ZeIw+zTV2vTrQMZlGxJUYdvDgbI3TA/Fj2ejokqIjDnJPE/Px4UwmqA81mig212LbtWJj/dj2i8ICu8zVZW2u27GhkfN7qt5U5xgpF2afMPzwjNORpLHa4tEpulMVsj8JjpJvsMvOwXKqShhw1Dl7l4TCNWuWju8vdIT+EKis2NIJ7JWModrCAFaJFRFTczDHiiEkubDFHw4PhshBVHMP0//PzUsp/QdMqMnWnjw1F6qyHrpFGBRkFesc2GusjjN0ExS9vCiSsBQive2qHwdUi5EIf0FyPDKVIpY94P/YRHBomqLHSfl4yXNBYbXYfe5LNr98Jtrt8iDU1kJGKOh9DAod01s3+/dbM+GyuIm0yDYTedzNVu+I3hMxSpZ6d/5vlBrvcQOIj7IkaL5Xlicbz+BizvJetow1OpjcDwUMqICxb/CmBNT81ipnldCy5zRKM/PPNH/JOkFEtJzGVr6mT3OZu0U2fO9HPGZg2ADc5W0eIkjJRKoEa46P5A/VFs/nPlDrmw/Yo54meN4OyLhWXmJvQNWhTwaokiefGetCiF+fQrmbEtIQcEVFvjLDTikU4CsmE9uxUE3O4R7zxg47fjwVJ76fDqSNt4l0EwiUyRJI+M+/AU5oGwq3OePtXN9MBZrjYeBU5zb70sXyd+L9+WjJbXR7UXbZIBCGii99IggRabdWkwrpnV2aBQHS+CKxTMgaoSp4noVNLVIVL6LVayf6gkfGkb8xfoCOdTRUXr+FNahKN6VfS9VLTiV6hIf4Il3sJV7vbhipIYVHwOcR/suoopCtHBjbN63+Awv8HAConDA3plarDxiim3Okf5vva2SEoifa4pv9oHfaqS5KUfOR2Icr6cwNnu8UMIBdhFci5v1sT8lG1WdLROOjivMxaVXBXPGptXSd57puyCEFELnZgjE1D/wsJR78T7nCzLGFPJu2FSiSTITA0wRA8LGfwEfmnN7R8u25UPCHJPIFaoKTomjel35pwk8uLHfLOcR1cm5YRRnOEChjyjFII5NGh1ftCI57W7D317HuVIxa8ZBsjdOJNmxH9vHnDUuHp X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: f673c639-7712-495c-26a4-08d93a48c9bd X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 15:24:14.7224 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dCp0Z1QeDfY1B4RaX1Sd82zpMAEbdO+kyBKDDr2YZbJwetPga0UA0N4CqEQT9dwQ/5EJUK4wDnXXff8Ut4lByw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE0P281MB0211 Received-SPF: pass client-ip=40.107.135.103; envelope-from=ep@stern-data.com; helo=DEU01-FR2-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * doc/guix.texi: Document wondershaper-service-type and wondershaper-configuration fields. --- doc/guix.texi | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index e71ec70859..14764bfae4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16890,6 +16890,79 @@ See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information. @end deffn +@cindex Wondershaper +@defvr {Scheme Variable} wondershaper-service-type +This is the type for a service that runs +@uref{https://github.com/magnific0/wondershaper, Wonder Shaper} once +during boot. It configures traffic control (tc) with a Hierarchy Token +Bucket (htb) queue both for upload and download. For upload three +classes are added in order to prioritize traffic. Priority 1 is the +highest priority and priority 3 is the lowest priority. Interactive +traffic (e.g. ssh) is designated priority 1, while non-interactive +traffic is designated priority 2. Priority 3 is reserved for specially +configured ports and addresses. The service is configured using a +@code{} record. Some options below are not +found in the original upstream release but are maintained +@uref{https://github.com/apapsch/wondershaper, in a fork} until merged. +These options are marked specially. + +@end defvr + +@deftp {Data Type} wondershaper-configuration +@table @asis +@item @code{wondershaper} (default: @code{wondershaper}) +The package that provides Wonder Shaper. This package is expected to +provide the script at @file{bin/wondershaper} relative to its output +directory. The default package is +@uref{https://github.com/apapsch/wondershaper, a fork of Wonder Shaper} +adding more configuration options. + +@item @code{interface} (default: @code{"eth0"}) +The interface for which the limits shall be applied. + +@item @code{download-speed} (default: @code{2048}) +Maximum download speed in kbits. Tune this parameter to be a bit less than +your actual download speed. + +@item @code{upload-speed} (default: @code{512}) +Maximum upload speed in kbits. Tune this parameter to be a bit less than +your actual upload speed. + +@item @code{prio-3-rate} (default: @code{download-speed * 20 / 100}) +Maximum rate (kbits) for the priority 3 class, which is the lowest priority for +upload traffic. In a desktop environment the default computed value +should suffice, while in a controlled environment you might want to set +a static value. This option exists only in the fork! + +@item @code{prio-3-ceil} (default: @code{download-speed * 90 / 100}) +Maximum burst rate (kbits) for the priority 3 class. The same remarks as +for @code{prio-3-rate} apply. This option exists only in the fork! + +@item @code{high-prio-dest} (default: @code{'()}) +List of destination IP addresses for which traffic is designated +priority 1. This applies to upload only. Note that SSH (not SCP), ICMP +and packets smaller than 64b are automatically designated priority 1 no +matter the destination address. + +@item @code{no-prio-host-src} (default: @code{'()}) +List of source IP addresses for which traffic is designated priority 3. +This applies to upload only. + +@item @code{no-prio-host-dest} (default: @code{'()}) +List of destination IP addresses for which traffic is designated +priority 3. This applies to upload only. + +@item @code{no-prio-port-src} (default: @code{'()}) +List of source port numbers for which traffic is designated priority 3. +This applies to upload only. + +@item @code{no-prio-port-dest} (default: @code{'()}) +List of destination port numbers for which traffic is designated +priority 3. This applies to upload only. + +@end table +@end deftp + The @code{(gnu services rsync)} module provides the following services: You might want an rsync daemon if you have files that you want available From patchwork Mon Jun 28 15:22:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 30760 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 329CF27BC83; Mon, 28 Jun 2021 16:25:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 904C027BC78 for ; Mon, 28 Jun 2021 16:25:46 +0100 (BST) Received: from localhost ([::1]:60454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxt8r-0006cR-Lg for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 11:25:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt8C-0005gt-4E for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxt8B-0006r5-Sz for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxt8B-0001oL-RG for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49257] [PATCH 4/4] Add wondershaper related copright lines. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 15:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49257 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49257@debbugs.gnu.org Cc: Aljosha Papsch X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16248938726856 (code B ref -1); Mon, 28 Jun 2021 15:25:03 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jun 2021 15:24:32 +0000 Received: from localhost ([127.0.0.1]:52271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7a-0001mP-V8 for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:45260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7V-0001m5-N1 for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7V-0004mZ-GY for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:21 -0400 Received: from mail-fr2deu01on2103.outbound.protection.outlook.com ([40.107.135.103]:22583 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7T-0006NH-91 for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JN0wWeEJ+7XOtN049l25B9qYCWmA/bFTKkuMXkFvsfWcQqPbegKA1NL+ddNLUS02qb7l9psEmywXILN6R5GXUTwFm+m02IErYS4nekFid8KVJ3imXPO8OJ72QrbceQvJi+ziQDb/M6M+Qttnwf6zAW0sHgrtVJq1Nl0TcVRM1w7moChIbV33dDW9GAqupVzur7tXU47x37BrIeCnc5N1tOAUgkt8OLtbrYMokF13cchqZ9Z1N1qt1FMQMwpvTjMuN2J/CeArcsmIokaFzMEDOIc0INc0C9h0im2y5+rAy+bdq4a+sepibbjX14c/0nE9HkX5VfkQyt1DHbQXLGLrrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M6dDx++1jOA8oLzOALlsIKUsUdFdIkM0Ve9TSCcOp6Y=; b=beYkqActi5sWRjLnTDUXhDlaX2e2UMKN3mVRvvGsxMBQp8OIWcDKnaNXksAbdsMGvqnoTzzC4omOUtsAvXiDE6o6ciX0zxUnAvsbRnwQFKE7g8FPU5FIvTOlYRtfzlZFZpBR5u1oRlHHhP1HFcO0ObW/Fpk66zk7tKE5NbNCml35pnEcDMPTAL/Di3/yowzejkBTPxZgB88gRiCv3z4amVCDVAH9sirhiXnTjVQxY36RDeKdxDcETWgBw21rKN73s3jVWU0MiDjNv6ZtyfzrS5xQxO2yRS9yF15sQpV9cv3lu3gLdXOWl8mr7XsDCt8GB433O318wlBJajqfFy6IjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M6dDx++1jOA8oLzOALlsIKUsUdFdIkM0Ve9TSCcOp6Y=; b=w+/6WqZJTTzyOdp9g7F10HdTqzZk2jYp0nvG3hHHICPgrf7k2vJ1/M/0/Jf80+L7gfX6zskNOznJksgMVtPxCGaqML5URH+FtBU4zi4b3f7XUE+r5M9C+ApbrtjV8mayQeA0HXT6jVc87ocK2HRjv5gFLNS2T1N9aYpSR0O2Bsjj3O6eWPjoEQNGaT/aL3yfi6muPJA4WLUzNxep/4UYrO2G3G5wflMNiRkAl5aoboEzq0smznSVZUJbGYJrJriGSYQowtPbbaz7vK4cNLMRx60Co+FsFkA9grMxCDB5SUf0bN7lOXh/sPNX1qDN0zN8ntm+sIqWVj3UT0XrJjLauw== Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BE0P281MB0211.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.17; Mon, 28 Jun 2021 15:24:15 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%7]) with mapi id 15.20.4287.021; Mon, 28 Jun 2021 15:24:15 +0000 From: Aljosha Papsch Date: Mon, 28 Jun 2021 17:22:32 +0200 Message-Id: <20210628152232.31073-5-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210628152232.31073-1-ep@stern-data.com> References: <20210628152232.31073-1-ep@stern-data.com> X-ClientProxiedBy: PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Mon, 28 Jun 2021 15:24:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da84b044-f67c-4a7b-637e-08d93a48c9ff X-MS-TrafficTypeDiagnostic: BE0P281MB0211: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:949; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AmobPiKaWkSWQzpyZY5QNkYiKRykAXnl0RCV2AaODGDJbdGnXLuN6chuvA5OGdlwy2CtkZlCn4GksU1iXJToPFOx0V/bB2kwwdWup0ZCHydzXhOC7kawBBeWRXyCp4VkIP2NNKYlUP5GY+RpQg1JFeIJ7wafhk1qHzV6n6h8O6YwzXNdnNA88tbJr//dv14/yX8zc33Nj46UJUxOgwFGdDc+duvtF/a5czVlWPY5X6x3rJVWMBPeNruAg9YtDwyhuS+2KkdhEzvze7YAXyMD9iMzn3U45yYAiWQYU8CePtoh9HfaIm+1WWYp/Z9gZo7rLGGyiI0tCVNvuOUwxzjAo8hh044D4e+zR1/hI5iAcurLywSQ1Ej7cCt3LDLmUe8I/TDBeseF6ZD5hu3Xh4Yd2Buh2lPIZaks5uqdNTZuCE9619jWAr5j8TCV5r0fHLvGQfy76jfzW/F/78U7x/8c1O7wgdnoU4nJD0Mn+cF+aJtNP5SOkkgl0C9NEz6/mai7akNSp/p6B1OQttFRJY3EFCs2PZ3f5IJjwpKmoV8VYzSO5AUejA5HunyK6CjrSlCixWGFV/p2CeOzkcZl1y+pEplR62WWcgDQZaov1cuyc+g36HKfZkYNCizmO55DmPMiebJG3X0jA+LluoDM2DN1lA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(366004)(376002)(136003)(39830400003)(52116002)(107886003)(8676002)(6666004)(186003)(478600001)(2906002)(86362001)(8936002)(6512007)(6506007)(6916009)(36756003)(4326008)(2616005)(316002)(38100700002)(5660300002)(6486002)(1076003)(66946007)(66556008)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eqpIJ0xPbbW0difAD93yTHlqXw4NyZqVW0yIzoYuvyaazmVOzMIcNf5b69t1319DTRsDAoMLEoe7/1c2LZ1GXRp+7Oj0+fHiJbLUGZzneVmg8OY4Gb4Jt7BwLD6pPw/jfQp53IEeuEWfChQ+hXc3RM67ev0M8I1YfbkN6/aAB/92aLYI1XaOfTPoZd/N1yzr0sAZqxmrTbY2z7aYm2D02PVD58APAZGgpHl81AxTbqbuI7HQklmiTRGHB/JCbNbvYbPjDUf227iUw1M3qC+7mbQgg1HeckqHG1AxzzuGKLGSqfClxqLa0mmtFIKdf1M8hT39qHOpVSFowmmY6kaEh/KCqvGJSnapnInG4sbPla8MBGDIlxpFlMwc+JqfVd1x91wLdCP7hHeArV0VDc8Y82SVakoiqJsvkmbPN3YtQbIh2k4/oxsrwx5t1GFinRrS+vOE6hIlMcdZyt2uGUIY1tF9BU55t+4m3idX7XLP3+/4xWLYVEHAX2YXJXtgVHDvHdcOsRJ/th+ntOTPUWzpD+fzWNPIRaPS8CvXM5Ls636/w2QxwczIisNKiAxOgJIsj/NOBY6FEi/xzCU/szO6LS4PWQfWMxJxvvEKIhOjWNvpROUQCQIEB4931NIgpxJIgq/+fwnAshGyUXJ3OX4w+nUtYf3zFxyWTSNSHnHpdEL82N7iLZ63et8pkOSSzBr/zlRpxPQ8AX08KoMF/zInQGI+YK/NrUelEaYIP8g1peCXYNv+E1OB1QfXq3Ih4+yeX0PwX5EMnH6xe/Cfww0pH5q9pJZuaSebOl6VnAqZ7xvuWdXha18Fj8WNhzU6dTHGdzWDi2VZZcLp3Gq33M6UIQc8PTKlj80nfjG0c8uwimWsmr4KpeycJ62XhSzuuaieXXJpNpvqKCsCQX4Wv8tpPyA+2HjRjrPIOlRdJmceNPwi+60YioZG7xk6nFHVXBaYemW2eQmok8ed4T+YRmXO+NugtQtYNRnozlQXZLv1/NT5+QQfkAc8vG6F6xPjU2fQ24SYNsfvlBUjbjpSVIXnmvz5smJ53P1cvW/lrUZJsbGiAvgK/NAstz8gSh6NDUq8f+pgUl0KzX+urn2o9b8igU2KE02pRkpy6hBzINHRZb0SGVZQrbQydz156uDjqa400gy9kYZf1v5kkEoKQNphTFR6Z3TxKUP5sUQW/tPzJoY2/JjRGFZKFQqct1QeeEXMhMwoyurD42zCHkfU1T8K0idNKsPyUeoNNuNyHwaZQmCOIIjY8Nyw5eU8Ez5AQleVfcIDtSwwrTkljAX8jBU0anEG338LeqQSI6BefEqY4HLRBki4bTfCPHxTXgM8oShBRVYdsjPs3Zsmc9o1teqrECRk2lsQaB4w58fdlNRIbyJNEZhcssOWJ6nXfhxgvRCa X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: da84b044-f67c-4a7b-637e-08d93a48c9ff X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 15:24:15.1585 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hI6Q6KHFQMb+nQTBycFWcA3xdu61dmqj+TpLDfN3E6+SzWNjQVZ2ZH2jeu4tvO98UyfcUE56+VcAsmYv5HPbXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE0P281MB0211 Received-SPF: pass client-ip=40.107.135.103; envelope-from=ep@stern-data.com; helo=DEU01-FR2-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- doc/guix.texi | 1 + gnu/packages/networking.scm | 1 + gnu/services/networking.scm | 1 + 3 files changed, 3 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 14764bfae4..2c86b00d49 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -90,6 +90,7 @@ Copyright @copyright{} 2020 Edgar Vincent@* Copyright @copyright{} 2021 Maxime Devos@* Copyright @copyright{} 2021 B. Wilson@* Copyright @copyright{} 2021 Xinglu Chen@* +Copyright @copyright{} 2021 Aljosha Papsch@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7374ad5dbc..878907f61f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Hamzeh Nasajpour ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Hartmut Goebel +;;; Copyright © 2021 Aljosha Papsch ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index a17f41aa30..c48cf50452 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Oleg Pykhalov ;;; Copyright © 2021 Christopher Lemmer Webber ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Aljosha Papsch ;;; ;;; This file is part of GNU Guix. ;;;