From cc8a4252b1e35eee4b122a216ee3c6f1e9b29a49 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Mon, 15 Feb 2021 14:51:02 -0700 Subject: [PATCH] strongswan: fix local_gateway discovery This has been observed by myself and @luizluca: ip route get is appending uid0 to the output, as seen from: root@OpenWrt2:~# ip route get 1.1.1.1 1.1.1.1 via 174.27.160.1 dev eth3 src 174.27.182.184 uid 0 cache root@OpenWrt2:~# so the fix is an anchored match, discarding all else. Also, using ip -o means never having to do multiline matches... Signed-off-by: Philip Prindeville (cherry picked from commit ec72d3a9e47954f0be844fb32abb5ca1e4dda667) --- net/strongswan/Makefile | 2 +- net/strongswan/files/ipsec.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 2ff5ec51ad..f292290d47 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.9.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ diff --git a/net/strongswan/files/ipsec.init b/net/strongswan/files/ipsec.init index 63b7507a23..1881e1f14f 100644 --- a/net/strongswan/files/ipsec.init +++ b/net/strongswan/files/ipsec.init @@ -249,7 +249,7 @@ config_remote() { local ipdest [ "$remote_gateway" = "%any" ] && ipdest="1.1.1.1" || ipdest="$remote_gateway" - local_gateway=`ip route get $ipdest | awk -F"src" '/src/{gsub(/ /,"");print $2}'` + local_gateway=$(ip -o route get "$ipdest" | awk '/ src / { print gensub(/^.* src ([^ ]*) .*$/, "\\1", "g"); }') } [ -n "$local_identifier" ] && secret_xappend -n "$local_identifier " || secret_xappend -n "$local_gateway " -- 2.30.2