diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2024-01-23 09:19:35 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2024-01-23 09:19:35 +0100 |
| commit | 039f8a124133b24a413d747bbee7bb0bee679961 (patch) | |
| tree | 8338c17e47294b39983f61b35a1007eefa8b3fac /package/network | |
| parent | 33f15dd6d41873b02eb8895b8886763659f1390c (diff) | |
| download | upstream-039f8a124133b24a413d747bbee7bb0bee679961.tar.gz upstream-039f8a124133b24a413d747bbee7bb0bee679961.tar.bz2 upstream-039f8a124133b24a413d747bbee7bb0bee679961.zip | |
wireguard-tools: avoid redundant jsonfilter calls
Use a single jsonfilter expression to yield the list of logical wireguard
interface names in shell compatible notation.
Supersedes: #12344
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network')
| -rw-r--r-- | package/network/utils/wireguard-tools/Makefile | 2 | ||||
| -rw-r--r-- | package/network/utils/wireguard-tools/files/wireguard_watchdog | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/network/utils/wireguard-tools/Makefile b/package/network/utils/wireguard-tools/Makefile index 5b1fab057d9..e2a86c97d8d 100644 --- a/package/network/utils/wireguard-tools/Makefile +++ b/package/network/utils/wireguard-tools/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wireguard-tools PKG_VERSION:=1.0.20210914 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/ diff --git a/package/network/utils/wireguard-tools/files/wireguard_watchdog b/package/network/utils/wireguard-tools/files/wireguard_watchdog index 0126f699bb4..fc90f4a25b3 100644 --- a/package/network/utils/wireguard-tools/files/wireguard_watchdog +++ b/package/network/utils/wireguard-tools/files/wireguard_watchdog @@ -59,7 +59,7 @@ check_peer_activity() { } # query ubus for all active wireguard interfaces -wg_ifaces=$(ubus -S call network.interface dump | jsonfilter -e '@.interface[@.up=true]' | jsonfilter -a -e '@[@.proto="wireguard"].interface' | tr "\n" " ") +eval $(ubus -S call network.interface dump | jsonfilter -e 'wg_ifaces=@.interface[@.up=true && @.proto="wireguard"].interface') # check every peer in every active wireguard interface config_load network |