diff options
| author | Paul Donald | 2026-02-03 05:18:01 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-02-08 23:47:28 +0000 |
| commit | 85342bea07f65bdd9a22fc45a4c977c9aa42a5fb (patch) | |
| tree | 68f865eccd713e69a8a72c4dfe0e4593c092212c | |
| parent | 436b090bc746441a658524a84b9e35afe468ec35 (diff) | |
| download | openwrt-85342bea07f65bdd9a22fc45a4c977c9aa42a5fb.tar.gz | |
wireguard-tools: fix script errors
follow-up to 148207730a3c9f3aea807df336ca33792e9d3c0f
Schoolboy error on the peer_psk value.
Also fix an issue when joining peer IPv4 and IPv6 AllowedIPs
(${peer_a_ips/ /, } replaces only the first space, while
${peer_a_ips// /, } replaces all the spaces).
Closes: https://github.com/openwrt/openwrt/issues/21847
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21851
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit 3f0de6a28db049b782dc7ce27ad8fd917499db31)
Link: https://github.com/openwrt/openwrt/pull/21840
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | package/network/utils/wireguard-tools/files/wireguard.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/network/utils/wireguard-tools/files/wireguard.sh b/package/network/utils/wireguard-tools/files/wireguard.sh index 738714e1c6..fa8e2142b5 100644 --- a/package/network/utils/wireguard-tools/files/wireguard.sh +++ b/package/network/utils/wireguard-tools/files/wireguard.sh @@ -84,7 +84,7 @@ proto_wireguard_setup() { config_get peer_port "$section" "endpoint_port" "51820" config_get peer_a_ips "$section" "allowed_ips" config_get peer_p_ka "$section" "persistent_keepalive" - config_get peer_psk "$section" "peer_psk" + config_get peer_psk "$section" "preshared_key" [ "${peer_eph##*:}" != "$peer_eph" ] && peer_eph="[$peer_eph]" @@ -94,7 +94,7 @@ proto_wireguard_setup() { [ -n "${peer_key}" ] && peer_block="${peer_block}PublicKey=${peer_key}\n" [ -n "${peer_psk}" ] && peer_block="${peer_block}PresharedKey=${peer_psk}\n" [ -n "${peer_eph}" ] && peer_block="${peer_block}Endpoint=${peer_eph}${peer_port:+:$peer_port}\n" - [ -n "${peer_a_ips}" ] && peer_block="${peer_block}AllowedIPs=${peer_a_ips/ /, }\n" + [ -n "${peer_a_ips}" ] && peer_block="${peer_block}AllowedIPs=${peer_a_ips// /, }\n" [ -n "${peer_p_ka}" ] && peer_block="${peer_block}PersistentKeepalive=${peer_p_ka}\n" [ -n "$peer_key" ] && peer_config="$peer_config$peer_block\n" |