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

Merge pull request #230 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2022-04-07 10:46:39 +08:00 • committed by GitHub
commit 0c748c6de5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -1577,7 +1577,8 @@ if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter
fi
if [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
#if [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
if [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && [ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ]; then
_log "Set firewall on server"
/etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1

46
openmptcprouter/files/etc/uci-defaults/1920-omr-network
View file

@ -307,7 +307,8 @@ uci -q delete network.loopback.ifname
uci -q set network.loopback.device='lo'
local board=$(board_name)
if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ] && [ "$(mnf_info -n)" = "RUTX1200XXXX" ]; then
if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then
# Same part for RUTX12 and RUTX11, maybe other RUTX ?
uci -q batch <<-EOF
set network.modem1=interface
set network.modem1.proto='modemmanager'
@ -332,28 +333,33 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ] && [ "$(mnf_info -n)
commit firewall
set network.modem2=interface
set network.modem2.proto='modemmanager'
set network.modem2.apn=''
set network.modem2.auth='none'
set network.modem2.iptype='ipv4v6'
set network.modem2.addlatency='0'
set network.modem2.force_link='1'
set network.modem2.device='/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb1/1-1/1-1.2'
set network.wan_modem2=interface
set network.wan_modem2.proto='dhcp'
set network.wan_modem2.device='wwan1'
set network.wan_modem2.force_link='1'
set network.wan_modem2.multipath='on'
set network.wan_modem2.addlatency='0'
set network.wan_modem2.hostname='*'
set network.wan_modem2.defaultroute='0'
set network.wan_modem2.peerdns='0'
set network.wan_modem2.ip4table=wan
commit network
add_list firewall.@zone[1].network='wan_modem2'
commit firewall
EOF
if [ "$(mnf_info -n)" = "RUTX1200XXXX" ] || ; then
uci -q batch <<-EOF
set network.modem2.apn=''
set network.modem2.auth='none'
set network.modem2.iptype='ipv4v6'
set network.modem2.addlatency='0'
set network.modem2.force_link='1'
set network.modem2.device='/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb1/1-1/1-1.2'
set network.wan_modem2=interface
set network.wan_modem2.proto='dhcp'
set network.wan_modem2.device='wwan1'
set network.wan_modem2.force_link='1'
set network.wan_modem2.multipath='on'
set network.wan_modem2.addlatency='0'
set network.wan_modem2.hostname='*'
set network.wan_modem2.defaultroute='0'
set network.wan_modem2.peerdns='0'
set network.wan_modem2.ip4table=wan
commit network
add_list firewall.@zone[1].network='wan_modem2'
commit firewall
EOF
fi
fi
uci -q commit macvlan
uci -q commit network
rm -f /tmp/luci-indexcache