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

Update openmptcprouter script and config to use device setting instead of ifname

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-06-25 19:48:43 +02:00
parent c5945ec683
commit ea3a4840c4
7 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -539,7 +539,7 @@ _get_gre_tunnel() {
set network.oip${i}.label="Tunnel for $publicaddr"
set network.oip${i}.proto=static
set network.oip${i}.nohostroute='1'
set network.oip${i}.ifname="@oip${i}gre"
set network.oip${i}.device="@oip${i}gre"
set network.oip${i}.ipv6='0'
set network.oip${i}.defaultroute='0'
set network.oip${i}.multipath='off'
@ -823,7 +823,7 @@ _set_vpn_ip() {
local settings
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
vpnifname="$(uci -q get network.omrvpn.ifname)"
vpnifname="$(uci -q get network.omrvpn.device)"
vpnip_local_current="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.remoteip')"
vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}')
vpnip_remote_current="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.localip')"
@ -850,7 +850,7 @@ _set_client2client() {
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
c2cips="$(echo "$vps_config" | jsonfilter -q -e '@.client2client.lanips[0]')"
vpnifname="$(uci -q get network.omrvpn.ifname)"
vpnifname="$(uci -q get network.omrvpn.device)"
vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}' | tr -d "\n")
vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep via | grep -v default | grep -v / | grep -v metric | awk '{print $1}' | tr -d "\n")
for lanip in $c2cips; do