Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/libreswan/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=libreswan
PKG_VERSION:=4.12
PKG_RELEASE:=4
PKG_RELEASE:=5

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.libreswan.org/
Expand Down
20 changes: 14 additions & 6 deletions net/libreswan/files/etc/init.d/ipsec
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ expand_phase2alg() {
phase2alg_proposal="${encryption_algorithm:+${encryption_algorithm// /+}${hash_algorithm:+-${hash_algorithm// /+}${dh_group:+-${dh_group// /+}}}}"
}

append_subnet() {
local subnet="$1"
local var="$2"

[ "$subnet" = "0.0.0.0" ] && subnet="0.0.0.0/0"
append "$var" "$subnet" ","
}

generate_tunnel_config() {
local id=$1
local config_file="$IPSEC_CONF_DIR/$id.conf"
Expand All @@ -95,8 +103,6 @@ generate_tunnel_config() {
config_get rightid "$id" rightid "$right"
config_get leftsourceip "$id" leftsourceip
config_get rightsourceip "$id" rightsourceip
config_get leftsubnets "$id" leftsubnets
config_get rightsubnets "$id" rightsubnets
config_get_bool ikev2 "$id" ikev2
[ "$ikev2" = "1" ] && ikev2=yes || ikev2=no
config_get_bool rekey "$id" rekey
Expand All @@ -111,20 +117,22 @@ generate_tunnel_config() {
config_get nflog "$id" nflog 0
[ "$nflog" = "0" ] && unset nflog

leftsubnets=""
rightsubnets=""
config_list_foreach "$id" ike expand_ike
config_list_foreach "$id" phase2alg expand_phase2alg
config_list_foreach "$id" leftsubnets append_subnet leftsubnets
config_list_foreach "$id" rightsubnets append_subnet rightsubnets

config_get authby "$id" authby
config_get psk "$id" psk

if [ -n "$leftsubnets" ]; then
[[ "$leftsubnets" =~ 0.0.0.0* ]] && leftsubnets="0.0.0.0/0"
leftsubnets="{${leftsubnets// /,}}"
leftsubnets="{${leftsubnets}}"
fi

if [ -n "$rightsubnets" ]; then
[[ "$rightsubnets" =~ 0.0.0.0* ]] && rightsubnets="0.0.0.0/0"
rightsubnets="{${rightsubnets// /,}}"
rightsubnets="{${rightsubnets}}"
fi

config_get interface "$id" interface
Expand Down
Loading