mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Set ULA to VPS API

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-05-14 21:15:36 +02:00
parent c0a26cbaa2
commit 4894da909e
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -521,8 +521,9 @@ _set_vpn_ip() {
vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep via | grep -v default | grep -v / | grep -v metric | awk '{print $1}' | tr -d "\n")
[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep kernel | awk '{print $1}' | tr -d "\n")
[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep "proto static src" | awk '{print $3}' | tr -d "\n")
ula="$(uci -q get network.globals.ula_prefix)"
if [ "$vpnip_remote" != "" ] && [ "$vpnip_local" != "" ] && ([ "$vpnip_remote" != "$vpnip_remote_current" ] || [ "$vpnip_local" != "$vpnip_local_current" ]); then
settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'"}'
settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'","ula" : "'$ula'"}'
result=$(_set_json "vpnips" "$settings")
fi
}
@ -717,6 +718,13 @@ _set_config_from_vps() {
/etc/init.d/omr-tracker restart
fi
ula="$(echo "$vps_config" | jsonfilter -q -e '@.6in4.ula')"
if [ -n "$ula" ]; then
uci -q batch <<-EOF >/dev/null
set network.globals.ula_prefix=$ula
EOF
fi
# Set current VPN
current_vpn="$(uci -q get openmptcprouter.settings.vpn)"
if [ -z "$current_vpn" ] || [ -n "$vps_lastchange" ] || [ "$user_permission" = "ro" ]; then