From patchwork Thu Jan 12 12:56:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Declan Tsien X-Patchwork-Id: 46065 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 A0DA227BBEB; Thu, 12 Jan 2023 12:58:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CE1AF27BBE9 for ; Thu, 12 Jan 2023 12:58:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFx9i-0006JL-TP; Thu, 12 Jan 2023 07:58:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFx9e-0006J1-Nq for guix-patches@gnu.org; Thu, 12 Jan 2023 07:58:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFx9e-0007hJ-7r for guix-patches@gnu.org; Thu, 12 Jan 2023 07:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFx9d-0000ZY-Sp for guix-patches@gnu.org; Thu, 12 Jan 2023 07:58:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60752] [PATCH] services: connman: Add iwd backend support. Resent-From: Declan Tsien Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Jan 2023 12:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60752@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16735282542163 (code B ref -1); Thu, 12 Jan 2023 12:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jan 2023 12:57:34 +0000 Received: from localhost ([127.0.0.1]:44974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFx9C-0000Yp-5H for submit@debbugs.gnu.org; Thu, 12 Jan 2023 07:57:34 -0500 Received: from lists.gnu.org ([209.51.188.17]:38220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFx9A-0000Yh-DR for submit@debbugs.gnu.org; Thu, 12 Jan 2023 07:57:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFx9A-00062x-2R for guix-patches@gnu.org; Thu, 12 Jan 2023 07:57:32 -0500 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFx96-0007Qu-4d for guix-patches@gnu.org; Thu, 12 Jan 2023 07:57:31 -0500 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4Nt4M951t7z9tDJ for ; Thu, 12 Jan 2023 12:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1673528229; bh=c7vrWmgaPz+N0O8sc8OpHotthHY8xo4T4brDYSU+KWA=; h=From:To:Subject:Date:From; b=PGXQERe2RB59AmBt/lGpwfVg7t4L/iA36BqAh7lG1vcqs00rX7SxFjWVLz2z2umDX y5v20W6uonCgDlJbHH5MFgrX47eyTLq/A+i4SeeWyk9RgyhR8Nb7Ul2oKSvzIoi5zw 63ukRU8wy0rnvtdZJrmunZ1hrs1n6GFXxPo/+hJg= X-Riseup-User-ID: 6A33FFB7043284A46F111A9661E65932D385DA7CEA57AA8D2C116C0342FCE248 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Nt4M91t47z5vRk for ; Thu, 12 Jan 2023 12:57:09 +0000 (UTC) From: Declan Tsien Date: Thu, 12 Jan 2023 20:56:59 +0800 Message-ID: <874jsvc3ms.fsf@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.6; envelope-from=declantsien@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From d15947bcbfd16b1509df555a2b05a5639dec923a Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Thu, 12 Jan 2023 18:37:51 +0800 Subject: [PATCH] services: connman: Add iwd backend support. * gnu/services/networking.scm (connman-configuration)[iwd?]: New field. (connman-shepherd-service): Applied iwd? logic. * doc/guix.texi: Add information about connman-configuration iwd? option. --- doc/guix.texi | 3 +++ gnu/services/networking.scm | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 751d0957d8..ac483dacb9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19726,6 +19726,9 @@ The connman package to use. @item @code{disable-vpn?} (default: @code{#f}) When true, disable connman's vpn plugin. + +@item @code{iwd?} (default: @code{#f}) +When true, ConnMan uses iwd to connect to wireless networks. @end table @end deftp diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 702404bc6c..f24c8f7063 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2022 Andrew Tropin +;;; Copyright © 2022 Declan Tsien ;;; ;;; This file is part of GNU Guix. ;;; @@ -1265,7 +1266,8 @@ (define-record-type* (connman connman-configuration-connman (default connman)) (disable-vpn? connman-configuration-disable-vpn? - (default #f))) + (default #f)) + (iwd? connman-configuration-iwd? (default #f))) (define (connman-activation config) (let ((disable-vpn? (connman-configuration-disable-vpn? config))) @@ -1281,18 +1283,21 @@ (define (connman-shepherd-service config) (and (connman-configuration? config) (let ((connman (connman-configuration-connman config)) - (disable-vpn? (connman-configuration-disable-vpn? config))) + (disable-vpn? (connman-configuration-disable-vpn? config)) + (iwd? (connman-configuration-iwd? config))) (list (shepherd-service (documentation "Run Connman") (provision '(networking)) (requirement - '(user-processes dbus-system loopback wpa-supplicant)) + (append '(user-processes dbus-system loopback) + (if iwd? '(iwd) '(wpa-supplicant)))) (start #~(make-forkexec-constructor (list (string-append #$connman "/sbin/connmand") "--nodaemon" "--nodnsproxy" - #$@(if disable-vpn? '("--noplugin=vpn") '())) + #$@(if disable-vpn? '("--noplugin=vpn") '()) + #$@(if iwd? '("--wifi=iwd_agent") '())) ;; As connman(8) notes, when passing '-n', connman ;; "directs log output to the controlling terminal in -- 2.38.1