From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 63402@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#63402] [PATCH v3 3/3] services: wireguard: Workaround keep-alives bug.
Date: Tue, 16 May 2023 00:09:08 -0400 [thread overview]
Message-ID: <7ae336651ea9af2aa191e99b8f046bfbc24a1335.1684210148.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <76b34e5229e0e97068cb3bd42152f29630a8dbfc.1684210148.git.maxim.cournoyer@gmail.com>
* gnu/services/vpn.scm (wireguard-configuration-file): Add the
'persistent-keepalive' option to the PostUp script to workaround a bug.
---
gnu/services/vpn.scm | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm
index 3f66db79de..587bfcfc0e 100644
--- a/gnu/services/vpn.scm
+++ b/gnu/services/vpn.scm
@@ -774,18 +774,19 @@ (define (wireguard-configuration-file config)
(format #f "~@[PersistentKeepalive = ~a~]" keep-alive))))
(string-join (remove string-null? lines) "\n"))))
- (define (peers->preshared-keys peer keys)
- (let ((public-key (wireguard-peer-public-key peer))
- (preshared-key (wireguard-peer-preshared-key peer)))
- (if preshared-key
- (cons* public-key preshared-key keys)
- keys)))
+ (define (peers->preshared-keys+keep-alive peer data)
+ (match-record peer <wireguard-peer>
+ (public-key preshared-key keep-alive)
+ (if (or preshared-key keep-alive)
+ (cons* public-key preshared-key keep-alive data)
+ data)))
(match-record config <wireguard-configuration>
(wireguard interface addresses port private-key peers dns
pre-up post-up pre-down post-down table)
(let* ((config-file (string-append interface ".conf"))
- (peer-keys (fold peers->preshared-keys (list) peers))
+ (peer-keys+keep-alive (fold peers->preshared-keys+keep-alive
+ '() peers))
(peers (map peer->config peers))
(config
(computed-file
@@ -805,9 +806,14 @@ (define (wireguard-configuration-file config)
#$@(if (null? pre-up)
'()
(list (format #f "~{PreUp = ~a~%~}" pre-up)))
+ ;; Duplicate the persistent-keepalive setting here, to
+ ;; workaround a bug in WireGuard where keep-alives are not
+ ;; sent when an interface is initially brought up without
+ ;; a private key.
(format #f "PostUp = ~a set %i private-key ~a\
-~{ peer ~a preshared-key ~a~}" #$(file-append wireguard "/bin/wg")
-#$private-key '#$peer-keys)
+~{ peer ~a~@[ preshared-key ~a~]~@[ persistent-keepalive ~a~]~}"
+ #$(file-append wireguard "/bin/wg")
+ #$private-key '#$peer-keys+keep-alive)
#$@(if (null? post-up)
'()
(list (format #f "~{PostUp = ~a~%~}" post-up)))
--
2.39.2
next prev parent reply other threads:[~2023-05-16 4:11 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 1:08 [bug#63402] [PATCH 0/1] Add a dynamic IP monitoring option to Wireguard service Maxim Cournoyer
2023-05-10 1:09 ` [bug#63403] [PATCH 1/1] services: wireguard: Implement a dynamic IP monitoring feature Maxim Cournoyer
2023-05-15 15:57 ` Maxim Cournoyer
2023-05-15 16:13 ` [bug#63402] [PATCH v2] " Maxim Cournoyer
2023-05-16 4:09 ` [bug#63402] [PATCH v3 1/3] " Maxim Cournoyer
2023-05-16 4:09 ` [bug#63402] [PATCH v3 2/3] services: wireguard: Clean-up configuration file serializer Maxim Cournoyer
2023-05-16 4:09 ` Maxim Cournoyer [this message]
2023-05-18 17:48 ` [bug#63402] [PATCH v4 0/4] Implement a dynamic IP monitoring feature Maxim Cournoyer
2023-05-18 17:48 ` [bug#63402] [PATCH v4 1/4] services: wireguard: " Maxim Cournoyer
2023-05-18 17:48 ` [bug#63402] [PATCH v4 2/4] services: wireguard: Clean-up configuration file serializer Maxim Cournoyer
2023-05-18 17:48 ` [bug#63402] [PATCH v4 3/4] services: wireguard: Add a 'configuration' action Maxim Cournoyer
2023-05-18 17:48 ` [bug#63402] [PATCH v4 4/4] gnu: linux-libre: Apply wireguard patch fixing keep-alive bug Maxim Cournoyer
2023-05-19 1:59 ` [bug#63402] [PATCH v5 0/5] Implement a dynamic IP monitoring feature Maxim Cournoyer
2023-05-19 1:59 ` [bug#63402] [PATCH v5 1/5] services: herd: Add a new 'current-service' procedure Maxim Cournoyer
2023-05-22 15:00 ` [bug#63403] [PATCH 1/1] services: wireguard: Implement a dynamic IP monitoring feature Ludovic Courtès
2023-05-22 23:22 ` [bug#63402] bug#63403: " Maxim Cournoyer
2023-05-24 14:44 ` [bug#63403] " Ludovic Courtès
2023-07-21 2:15 ` Maxim Cournoyer
2023-05-19 1:59 ` [bug#63402] [PATCH v5 2/5] " Maxim Cournoyer
2023-05-22 15:03 ` [bug#63402] bug#63403: [PATCH 1/1] " Ludovic Courtès
2023-05-22 23:32 ` Maxim Cournoyer
2023-05-24 14:53 ` [bug#63403] " Ludovic Courtès
2023-05-24 22:12 ` Bruno Victal
2023-05-25 15:13 ` Maxim Cournoyer
2023-05-24 17:25 ` [bug#63402] [PATCH v5 2/5] " Bruno Victal
2023-07-21 3:55 ` Maxim Cournoyer
2023-07-21 13:23 ` Bruno Victal
2023-07-21 15:56 ` Maxim Cournoyer
2023-07-21 16:18 ` bug#63402: " Maxim Cournoyer
2023-05-19 1:59 ` [bug#63402] [PATCH v5 3/5] services: wireguard: Clean-up configuration file serializer Maxim Cournoyer
2023-05-19 1:59 ` [bug#63402] [PATCH v5 4/5] services: wireguard: Add a 'configuration' action Maxim Cournoyer
2023-05-19 1:59 ` [bug#63402] [PATCH v5 5/5] gnu: linux-libre: Apply wireguard patch fixing keep-alive bug Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7ae336651ea9af2aa191e99b8f046bfbc24a1335.1684210148.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=63402@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).