summaryrefslogtreecommitdiff
path: root/sysdep
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2020-05-13 17:34:23 +0200
committerMikael Magnusson <mikma@users.sourceforge.net>2023-08-28 23:45:08 +0200
commit78f7de8fc59040b67eb266e1361305eacc42529c (patch)
tree4abb692d84e98bed1e3ee8596be6076e6ebf7f96 /sysdep
parenta901a0643837bb40cdd955c43577c1e5887fe49d (diff)
Wg-user: Work-around listen_port mutex dead lock
Problem with listen_port dead lock in wireguard-go.
Diffstat (limited to 'sysdep')
-rw-r--r--sysdep/unix/wg_user.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sysdep/unix/wg_user.c b/sysdep/unix/wg_user.c
index 9192f952..df2dafa6 100644
--- a/sysdep/unix/wg_user.c
+++ b/sysdep/unix/wg_user.c
@@ -212,8 +212,13 @@ static int
user_put_device(wg_device *dev, byte **buf, uint *size)
{
wg_put_u16("set", 1, buf, size);
- wg_put_key("private_key", dev->private_key, buf, size);
- wg_put_u16("listen_port", dev->listen_port, buf, size);
+ if (dev->flags & WGDEVICE_HAS_PRIVATE_KEY)
+ wg_put_key("private_key", dev->private_key, buf, size);
+#if 0
+ /* Setting listen_port causes dead-lock in wireguard-go. */
+ if (dev->flags & WGDEVICE_HAS_LISTEN_PORT)
+ wg_put_u16("listen_port", dev->listen_port, buf, size);
+#endif
wg_put_bool("replace_peers", dev->flags & WGDEVICE_REPLACE_PEERS, buf, size);
wg_peer *peer = NULL;