[PATCH] services: connman: Add iwd backend support.

Done

Details

3 participants

Andrew Tropin
Declan Tsien
Bruno Victal

Owner: unassigned

Submitted by: Declan Tsien

Severity: normal

Merged with

60800

Declan Tsien wrote on 12 Jan 2023 13:56

Recipients:(address . guix-patches@gnu.org)

Message-ID:874jsvc3ms.fsf@riseup.net

From d15947bcbfd16b1509df555a2b05a5639dec923a Mon Sep 17 00:00:00 2001
From: Declan Tsien <declantsien@riseup.net>
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(-)

Toggle diff (63 lines)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 <maximedevos@telenet.be>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2022 Andrew Tropin <andrew@trop.in>
+;;; Copyright © 2022 Declan Tsien <declantsien@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1265,7 +1266,8 @@ (define-record-type* <connman-configuration>
   (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

Bruno Victal wrote on 12 Jan 2023 15:12

Recipients:(address . 60752@debbugs.gnu.org)(address . declantsien@riseup.net)

Message-ID:e9b7a448-0a87-a8d5-08c0-c5d600be0823@makinata.eu

Hi,

Does connman absolutely require a wireless adapter backend?

IMO if that's not the case, neither iwd nor wpa-supplicant backends should be pulled by connman. (or at least they should be required only if they are present among the services field)

This is because not every machine comes or wants to use a wireless adapter.

Cheers,

Bruno

Declan Tsien wrote on 12 Jan 2023 15:31

Recipients:(address . 60752@debbugs.gnu.org)(name . Bruno Victal)(address . mirai@makinata.eu)

Message-ID:87fscfbz9k.fsf@riseup.net

Bruno Victal <mirai@makinata.eu> writes:

Toggle quote (5 lines)

> IMO if that's not the case, neither iwd nor wpa-supplicant backends should be pulled by connman. (or at least they should be required only if they are present among the services field)

> This is because not every machine comes or wants to use a wireless adapter.

Right, are you suggesting removing wpa-supplicant from requirement

field?

Yeah, it would make more sense and fit my needs too.

Bruno Victal wrote on 12 Jan 2023 15:53

Recipients:

Message-ID:b263b300-a3c5-f579-45b5-c72cc7f9466e@makinata.eu

On 2023-01-12 14:31, Declan Tsien wrote:

Toggle quote (10 lines)> Bruno Victal <mirai@makinata.eu> writes:
> 
>>
>> IMO if that's not the case, neither iwd nor wpa-supplicant backends should be pulled by connman. (or at least they should be required only if they are present among the services field)
>> This is because not every machine comes or wants to use a wireless adapter.
>>
> 
> Right, are you suggesting removing wpa-supplicant from requirement
> field?

If that's possible, yes.

Declan Tsien wrote on 12 Jan 2023 16:22

Recipients:(name . Bruno Victal)(address . mirai@makinata.eu)(address . 60752@debbugs.gnu.org)

Message-ID:871qnzwzfn.fsf@riseup.net

Bruno Victal <mirai@makinata.eu> writes:

Toggle quote (13 lines)> On 2023-01-12 14:31, Declan Tsien wrote:
>> Bruno Victal <mirai@makinata.eu> writes:
>> 
>>>
>>> IMO if that's not the case, neither iwd nor wpa-supplicant backends should be pulled by connman. (or at least they should be required only if they are present among the services field)
>>> This is because not every machine comes or wants to use a wireless adapter.
>>>
>> 
>> Right, are you suggesting removing wpa-supplicant from requirement
>> field?
>
> If that's possible, yes.

I think that is a question for people with more knowledge in this regard.

But to my experiencing using connman and iwd. I think it's OK.

Now I am running these two shepherd services separately

- connman (without wpa-supplicant and iwd)

- iwd

This patch can be closed without applying.

Thanks for clarifying things for me.

Declan Tsien wrote on 14 Jan 2023 02:17

[Declan Tsien] Re: [bug#60752] [PATCH] services: connman: Add option to disable wpa-supplicant.

Recipients:(address . 60752@debbugs.gnu.org)

Message-ID:87wn5pap9t.fsf@riseup.net

-------------------- Start of forwarded message --------------------
From: Declan Tsien <declantsien@riseup.net>
To: Bruno Victal <mirai@makinata.eu>
Subject: Re: [bug#60752] [PATCH] services: connman: Add option to disable
 wpa-supplicant.
Date: Sat, 14 Jan 2023 09:13:50 +0800

Bruno Victal <mirai@makinata.eu> writes:

Toggle quote (10 lines)> Hi,
>
> Does connman absolutely require a wireless adapter backend?
> IMO if that's not the case, neither iwd nor wpa-supplicant backends should be pulled by connman. (or at least they should be required only if they are present among the services field)
> This is because not every machine comes or wants to use a wireless adapter.
>
>
> Cheers,
> Bruno

Hi,

what about this.

From 379d4afac343101a2351bab4f314496395828d8d Mon Sep 17 00:00:00 2001
From: Declan Tsien <declantsien@riseup.net>
Date: Sat, 14 Jan 2023 08:57:02 +0800
Subject: [PATCH] services: connman: Add option to disable wpa-supplicant.

* gnu/services/networking.scm
(connman-configuration)[disable-wpa-supplicant?]: New field.
(connman-shepherd-service): Applied disable-wpa-supplicant? logic.

* doc/guix.texi: Add information about connman-configuration
disable-wpa-supplicant? option.
---
 doc/guix.texi               |  4 ++++
 gnu/services/networking.scm | 20 ++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

Toggle diff (65 lines)diff --git a/doc/guix.texi b/doc/guix.texi
index 751d0957d8..29be830bd4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19726,6 +19726,10 @@ The connman package to use.
 
 @item @code{disable-vpn?} (default: @code{#f})
 When true, disable connman's vpn plugin.
+
+@item @code{disable-wpa-supplicant?} (default: @code{#f})
+When true, remove @code{wpa-supplicant} requirement. Let users disable
+wireless adapters or hook in a another implementation like @code{iwd}.
 @end table
 @end deftp
 
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 702404bc6c..39162fe822 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2022 Andrew Tropin <andrew@trop.in>
+;;; Copyright © 2023 Declan Tsien <declantsien@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1262,10 +1263,12 @@ (define network-manager-service-type
 (define-record-type* <connman-configuration>
   connman-configuration make-connman-configuration
   connman-configuration?
-  (connman      connman-configuration-connman
-                (default connman))
-  (disable-vpn? connman-configuration-disable-vpn?
-                (default #f)))
+  (connman                 connman-configuration-connman
+                           (default connman))
+  (disable-vpn?            connman-configuration-disable-vpn?
+                           (default #f))
+  (disable-wpa-supplicant? connman-configuration-disable-wpa-supplicant?
+                           (default #f)))
 
 (define (connman-activation config)
   (let ((disable-vpn? (connman-configuration-disable-vpn? config)))
@@ -1280,13 +1283,14 @@ (define (connman-shepherd-service config)
   "Return a shepherd service for Connman"
   (and
    (connman-configuration? config)
-   (let ((connman      (connman-configuration-connman config))
-         (disable-vpn? (connman-configuration-disable-vpn? config)))
+   (let ((connman                 (connman-configuration-connman config))
+         (disable-vpn?            (connman-configuration-disable-vpn? config))
+         (disable-wpa-supplicant? (connman-configuration-disable-wpa-supplicant? config)))
      (list (shepherd-service
             (documentation "Run Connman")
             (provision '(networking))
-            (requirement
-             '(user-processes dbus-system loopback wpa-supplicant))
+            (requirement (append '(user-processes dbus-system loopback)
+                                 (if disable-wpa-supplicant? '() '(wpa-supplicant))))
             (start #~(make-forkexec-constructor
                       (list (string-append #$connman
                                            "/sbin/connmand")
-- 
2.38.1

This way, connman service can let users disable wireless adapters or hook

in a another implementation like iwd.

Cheers,

Declan

-------------------- End of forwarded message --------------------

Declan Tsien wrote on 14 Jan 2023 02:54

Recipients:(address . 60752-done@debbugs.gnu.org)

Message-ID:87pmbhank4.fsf@riseup.net

Started a new thread since the subject has changed

https://issues.guix.gnu.org/60800

Closed

Andrew Tropin wrote on 16 Jan 2023 17:34

Recipients:(address . control@debbugs.gnu.org)

Message-ID:87o7qyl9pn.fsf@trop.in

reopen 60752

merge 60752 60800

Andrew Tropin wrote on 16 Jan 2023 18:22

Recipients:

Message-ID:87k01ml7i4.fsf@trop.in

On 2023-01-14 09:54, Declan Tsien wrote:

Toggle quote (3 lines)

> Started a new thread since the subject has changed

> https://issues.guix.gnu.org/60800

Let's keep the discussion in this thread, not to lose the context.

BTW, there is a retitle command for debbugs in case it necessary to

change the title of the bug.

From what I see wpa-supplicant requirement is not needed, as Bruno

mentioned, there are use cases, where connman can be used without

wpa-supplicant or wireless backend at all.

According to the documentation I was able to find, to enable iwd support

--wifi=iwd_agent should be added to connmand, so I applied the first

patch with a few adjustments: Completely removed wpa-supplicant

requirement, realigned the code. Unfortunately, I don't use connman and

can't easily check, Declan, could you please confirm that iwd is now

working correctly with connman?

Best regards,

Andrew Tropin

Closed

Declan Tsien wrote on 17 Jan 2023 01:30

Recipients:(name . Andrew Tropin)(address . andrew@trop.in)(address . 60752@debbugs.gnu.org)

Message-ID:87fscadmte.fsf@riseup.net

Andrew Tropin <andrew@trop.in> writes:

Toggle quote (11 lines)> On 2023-01-14 09:54, Declan Tsien wrote:
>
>> Started a new thread since the subject has changed
>> https://issues.guix.gnu.org/60800
>
> Let's keep the discussion in this thread, not to lose the context.
>
> BTW, there is a retitle command for debbugs in case it necessary to
> change the title of the bug. 
>

Thanks.

Toggle quote (16 lines)>
> From what I see wpa-supplicant requirement is not needed, as Bruno
> mentioned, there are use cases, where connman can be used without
> wpa-supplicant or wireless backend at all.
>
> According to the documentation I was able to find, to enable iwd support
> --wifi=iwd_agent should be added to connmand, so I applied the first
> patch with a few adjustments: Completely removed wpa-supplicant
> requirement, realigned the code.  Unfortunately, I don't use connman and
> can't easily check, Declan, could you please confirm that iwd is now
> working correctly with connman?
>
> -- 
> Best regards,
> Andrew Tropin

Yeah, Its working.

In my case, --wifi=iwd_agent is not required either when using iwd.

But it should be useful when wpa-supplicant and iwd services are both

in the system.

Best regards,

Declan Tsien

Your comment

This issue is archived.

To comment on this conversation send an email to 60752@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 60752

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date