travelmate: update 2.1.2-5
* final vpn tweaks Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
parent
3917a0af58
commit
bec5f35dea
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=travelmate
|
PKG_NAME:=travelmate
|
||||||
PKG_VERSION:=2.1.2
|
PKG_VERSION:=2.1.2
|
||||||
PKG_RELEASE:=4
|
PKG_RELEASE:=5
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
||||||
|
|
||||||
|
|
|
@ -205,43 +205,37 @@ f_vpn() {
|
||||||
if [ ! -f "${trm_vpnfile}" ] || { [ -f "${trm_vpnfile}" ] && [ "${vpn_action}" = "enable" ]; }; then
|
if [ ! -f "${trm_vpnfile}" ] || { [ -f "${trm_vpnfile}" ] && [ "${vpn_action}" = "enable" ]; }; then
|
||||||
for info in ${trm_vpninfolist}; do
|
for info in ${trm_vpninfolist}; do
|
||||||
iface="${info%%&&*}"
|
iface="${info%%&&*}"
|
||||||
if [ "${iface}" = "${info}" ]; then
|
|
||||||
vpn_instance=""
|
|
||||||
else
|
|
||||||
vpn_instance="${info##*&&}"
|
|
||||||
fi
|
|
||||||
vpn_status="$(ifstatus "${iface}" | "${trm_jsoncmd}" -ql1 -e '@.up')"
|
vpn_status="$(ifstatus "${iface}" | "${trm_jsoncmd}" -ql1 -e '@.up')"
|
||||||
if [ "${vpn_status}" = "true" ]; then
|
if [ "${vpn_status}" = "true" ]; then
|
||||||
/sbin/ifdown "${iface}"
|
/sbin/ifdown "${iface}"
|
||||||
"${trm_ubuscmd}" -S call network.interface."${iface}" remove >/dev/null 2>&1
|
"${trm_ubuscmd}" -S call network.interface."${iface}" remove >/dev/null 2>&1
|
||||||
f_log "info" "take down vpn interface '${iface}/${vpn_instance:-"-"}' (initial)"
|
f_log "info" "take down vpn interface '${iface}' (initial)"
|
||||||
fi
|
fi
|
||||||
|
[ "${iface}" = "${info}" ] && vpn_instance="" || vpn_instance="${info##*&&}"
|
||||||
if [ -x "/etc/init.d/openvpn" ] && [ -n "${vpn_instance}" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
if [ -x "/etc/init.d/openvpn" ] && [ -n "${vpn_instance}" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
||||||
/etc/init.d/openvpn stop "${vpn_instance}"
|
/etc/init.d/openvpn stop "${vpn_instance}"
|
||||||
f_log "info" "take down openvpn instance '${vpn_instance:-"-"}' (initial)"
|
f_log "info" "take down openvpn instance '${vpn_instance}' (initial)"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
rm -f "${trm_vpnfile}"
|
rm -f "${trm_vpnfile}"
|
||||||
elif [ "${vpn}" = "1" ] && [ -n "${vpn_iface}" ] && [ "${vpn_action}" = "enable_keep" ]; then
|
elif [ "${vpn}" = "1" ] && [ -n "${vpn_iface}" ] && [ "${vpn_action}" = "enable_keep" ]; then
|
||||||
for info in ${trm_vpninfolist}; do
|
for info in ${trm_vpninfolist}; do
|
||||||
iface="${info%%&&*}"
|
iface="${info%%&&*}"
|
||||||
if [ "${iface}" = "${info}" ]; then
|
|
||||||
vpn_instance=""
|
|
||||||
else
|
|
||||||
vpn_instance="${info##*&&}"
|
|
||||||
fi
|
|
||||||
vpn_status="$(ifstatus "${iface}" | "${trm_jsoncmd}" -ql1 -e '@.up')"
|
vpn_status="$(ifstatus "${iface}" | "${trm_jsoncmd}" -ql1 -e '@.up')"
|
||||||
if [ "${vpn_status}" = "true" ] && [ "${iface}" != "${vpn_iface}" ]; then
|
if [ "${vpn_status}" = "true" ] && [ "${iface}" != "${vpn_iface}" ]; then
|
||||||
/sbin/ifdown "${iface}"
|
/sbin/ifdown "${iface}"
|
||||||
f_log "info" "take down vpn interface '${iface}/${vpn_instance:-"-"}' (switch)"
|
f_log "info" "take down vpn interface '${iface}' (switch)"
|
||||||
rm -f "${trm_vpnfile}"
|
rc="1"
|
||||||
break
|
|
||||||
fi
|
fi
|
||||||
|
[ "${iface}" = "${info}" ] && vpn_instance="" || vpn_instance="${info##*&&}"
|
||||||
if [ -x "/etc/init.d/openvpn" ] && [ -n "${vpn_instance}" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
if [ -x "/etc/init.d/openvpn" ] && [ -n "${vpn_instance}" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
||||||
/etc/init.d/openvpn stop "${vpn_instance}"
|
/etc/init.d/openvpn stop "${vpn_instance}"
|
||||||
f_log "info" "take down openvpn instance '${vpn_instance:-"-"}' (switch)"
|
f_log "info" "take down openvpn instance '${vpn_instance}' (switch)"
|
||||||
|
rc="1"
|
||||||
fi
|
fi
|
||||||
|
[ "${rc}" = "1" ] && break
|
||||||
done
|
done
|
||||||
|
rm -f "${trm_vpnfile}"
|
||||||
fi
|
fi
|
||||||
if [ -x "${trm_vpnpgm}" ] && [ -n "${vpn_service}" ] && [ -n "${vpn_iface}" ]; then
|
if [ -x "${trm_vpnpgm}" ] && [ -n "${vpn_service}" ] && [ -n "${vpn_iface}" ]; then
|
||||||
if { [ "${vpn_action}" = "disable" ] && [ -f "${trm_vpnfile}" ]; } ||
|
if { [ "${vpn_action}" = "disable" ] && [ -f "${trm_vpnfile}" ]; } ||
|
||||||
|
@ -251,11 +245,7 @@ f_vpn() {
|
||||||
for info in ${trm_vpninfolist}; do
|
for info in ${trm_vpninfolist}; do
|
||||||
iface="${info%%&&*}"
|
iface="${info%%&&*}"
|
||||||
if [ "${iface}" = "${vpn_iface}" ]; then
|
if [ "${iface}" = "${vpn_iface}" ]; then
|
||||||
if [ "${iface}" = "${info}" ]; then
|
[ "${iface}" = "${info}" ] && vpn_instance="" || vpn_instance="${info##*&&}"
|
||||||
vpn_instance=""
|
|
||||||
else
|
|
||||||
vpn_instance="${info##*&&}"
|
|
||||||
fi
|
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue