Skip to content

Commit 72aa05a

Browse files
remibergsmaDaanHoogland
authored andcommitted
renamed $leftgw to $leftnexthop to make clear what it does
(cherry picked from commit 8b2563a)
1 parent 2df7eb5 commit 72aa05a

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ vpnoutmark="0x525"
2323
vpninmark="0x524"
2424

2525
usage() {
26-
printf "Usage: %s: (-A|-D) -l <left-side vpn peer> -n <left-side guest cidr> -g <left-side gateway> -r <right-side vpn peer> -N <right-side private subnets> -e <esp policy> -i <ike policy> -t <ike lifetime> -T <esp lifetime> -s <pre-shared secret> -d <dpd 0 or 1> [ -p <passive or not> ]\n" $(basename $0) >&2
26+
printf "Usage: %s: (-A|-D) -l <left-side vpn peer> -n <left-side guest cidr> -g <left-side next hop> -r <right-side vpn peer> -N <right-side private subnets> -e <esp policy> -i <ike policy> -t <ike lifetime> -T <esp lifetime> -s <pre-shared secret> -d <dpd 0 or 1> [ -p <passive or not> ]\n" $(basename $0) >&2
2727
}
2828

2929
#set -x
@@ -129,7 +129,7 @@ ipsec_tunnel_add() {
129129
local vpnsecretsfile=$vpnconfdir/ipsec.vpn-$rightpeer.secrets
130130

131131
logger -t cloud "$(basename $0): creating configuration for ipsec tunnel: left peer=$leftpeer \
132-
left net=$leftnet left gateway=$leftgw right peer=$rightpeer right network=$rightnets phase1 policy=$ikepolicy \
132+
left net=$leftnet left gateway=$leftnexthop right peer=$rightpeer right network=$rightnets phase1 policy=$ikepolicy \
133133
phase2 policy=$esppolicy secret=$secret"
134134

135135
[ "$op" == "-A" ] && ipsec_tunnel_del
@@ -139,7 +139,7 @@ ipsec_tunnel_add() {
139139
sudo echo "conn vpn-$rightpeer" > $vpnconffile &&
140140
sudo echo " left=$leftpeer" >> $vpnconffile &&
141141
sudo echo " leftsubnet=$leftnet" >> $vpnconffile &&
142-
sudo echo " leftnexthop=$leftgw" >> $vpnconffile &&
142+
sudo echo " leftnexthop=$leftnexthop" >> $vpnconffile &&
143143
sudo echo " right=$rightpeer" >> $vpnconffile &&
144144
sudo echo " rightsubnets={$rightnets}" >> $vpnconffile &&
145145
sudo echo " type=tunnel" >> $vpnconffile &&
@@ -226,7 +226,7 @@ do
226226
leftnet="$OPTARG"
227227
;;
228228
g) gflag=1
229-
leftgw="$OPTARG"
229+
leftnexthop="$OPTARG"
230230
;;
231231
r) rflag=1
232232
rightpeer="$OPTARG"

0 commit comments

Comments
 (0)