Merge pull request #20857 from pprindeville/strongswan-drop-local_gateway
strongswan: local_gateway unused in swanctl.init
This commit is contained in:
commit
9569c7c03f
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=strongswan
|
PKG_NAME:=strongswan
|
||||||
PKG_VERSION:=5.9.10
|
PKG_VERSION:=5.9.10
|
||||||
PKG_RELEASE:=3
|
PKG_RELEASE:=4
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
|
PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
|
||||||
|
|
|
@ -418,7 +418,6 @@ config_connection() {
|
||||||
|
|
||||||
local enabled
|
local enabled
|
||||||
local gateway
|
local gateway
|
||||||
local local_gateway
|
|
||||||
local local_sourceip
|
local local_sourceip
|
||||||
local local_ip
|
local local_ip
|
||||||
local remote_gateway
|
local remote_gateway
|
||||||
|
@ -478,10 +477,6 @@ config_connection() {
|
||||||
|
|
||||||
[ "$gateway" = "any" ] && remote_gateway="%any" || remote_gateway="$gateway"
|
[ "$gateway" = "any" ] && remote_gateway="%any" || remote_gateway="$gateway"
|
||||||
|
|
||||||
local ipdest
|
|
||||||
[ "$remote_gateway" = "%any" ] && ipdest="1.1.1.1" || ipdest="$remote_gateway"
|
|
||||||
local_gateway=`ip -o route get $ipdest | awk '/ src / { gsub(/^.* src /,""); gsub(/ .*$/, ""); print $0}'`
|
|
||||||
|
|
||||||
if [ -n "$local_key" ]; then
|
if [ -n "$local_key" ]; then
|
||||||
[ "$(dirname "$local_key")" != "." ] && \
|
[ "$(dirname "$local_key")" != "." ] && \
|
||||||
fatal "local_key $local_key can't be pathname"
|
fatal "local_key $local_key can't be pathname"
|
||||||
|
|
Loading…
Reference in New Issue