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

Try to fix client2client routes

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-03-03 10:51:42 +01:00
parent 4cf33af2de
commit 02b0fe3040
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -524,7 +524,7 @@ _set_client2client() {
[ -z "$vps_config" ] && return [ -z "$vps_config" ] && return
c2cips="$(echo "$vps_config" | jsonfilter -q -e '@.client2client.lanips')" c2cips="$(echo "$vps_config" | jsonfilter -q -e '@.client2client.lanips')"
vpnifname="$(uci -q get network.omrvpn.ifname)" vpnifname="$(uci -q get network.omrvpn.ifname)"
vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}') vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}' | tr -d "\n")
for lanip in $c2cips; do for lanip in $c2cips; do
c2cid=$((c2cid+1)) c2cid=$((c2cid+1))
target=$(echo $lanip | awk -F '/' '{print $1}' | tr -d "\n") target=$(echo $lanip | awk -F '/' '{print $1}' | tr -d "\n")
@ -932,12 +932,25 @@ _set_config_from_vps() {
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
del openmptcprouter.${servername}.available_vpn del openmptcprouter.${servername}.available_vpn
EOF EOF
if [ -n "$available_vpn" ]; then
for vpn in $available_vpn; do if [ "$user_permission" = "ro" ]; then
current_vpn="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.current')"
if [ -n "$current_vpn" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
add_list openmptcprouter.${servername}.available_vpn=$vpn delete openmptcprouter.${servername}.available_vpn
set openmptcprouter.${servername}.available_vpn=${current_vpn}
EOF EOF
done fi
else
if [ -n "$available_vpn" ]; then
for vpn in $available_vpn; do
uci -q batch <<-EOF >/dev/null
delete openmptcprouter.${servername}.available_vpn
add_list openmptcprouter.${servername}.available_vpn=$vpn
EOF
done
fi
fi fi
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.get_config=0 set openmptcprouter.${servername}.get_config=0