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 #251 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2022-06-29 09:18:02 +08:00 • committed by GitHub
commit a3c54edec2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
View file

@ -332,4 +332,6 @@ Thanks :)*/
} }
.spaceline { .spaceline {
height: 55px; height: 55px;
z-index: -10;
position: relative;
} }

2
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -101,7 +101,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
temp += '<li id="networkRootNode"><table><tr><td><table>'; temp += '<li id="networkRootNode"><table><tr><td><table>';
if (mArray.wans) if (mArray.wans)
{ {
temp += '<tr class="space"><td></td></tr>'; temp += '<tr class="spaceline"><td></td></tr>';
for( var j = 1; j < mArray.wans.length; j++ ) for( var j = 1; j < mArray.wans.length; j++ )
{ {
temp += '<tr class="spaceline"><td></td></tr>'; temp += '<tr class="spaceline"><td></td></tr>';

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

@ -709,8 +709,8 @@ default_gw6=$(ip -6 route get 2606:4700:4700::1111 | grep via | awk '{print $3}'
interface_up=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["up"]') interface_up=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["up"]')
if [ -n "$(grep RUTX /etc/board.json)" ] && [ -n "$OMR_TRACKER_INTERFACE" ]; then if [ -n "$(grep RUTX /etc/board.json)" ] && [ -n "$OMR_TRACKER_DEVICE" ]; then
if [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.device)" = "wwan0" ]; then if [ "$OMR_TRACKER_DEVICE" = "wwan0" ]; then
modemdata=$(omr-modemmanager '/sys/devices/platform/soc/60f8800.usb2/6000000.dwc3/xhci-hcd.1.auto/usb3/3-1' all) modemdata=$(omr-modemmanager '/sys/devices/platform/soc/60f8800.usb2/6000000.dwc3/xhci-hcd.1.auto/usb3/3-1' all)
gen=$(echo $modemdata | cut -d ';' -f 5 | tr -d '\n') gen=$(echo $modemdata | cut -d ';' -f 5 | tr -d '\n')
if [ "$gen" = "gsm" ]; then if [ "$gen" = "gsm" ]; then
@ -752,7 +752,7 @@ if [ -n "$(grep RUTX /etc/board.json)" ] && [ -n "$OMR_TRACKER_INTERFACE" ]; the
else else
echo "none" > /sys/class/leds/mob_ssid_5/trigger echo "none" > /sys/class/leds/mob_ssid_5/trigger
fi fi
elif [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.device)" = "wwan1" ]; then elif [ "$OMR_TRACKER_DEVICE" = "wwan1" ]; then
modemdata=$(omr-modemmanager '/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb1/1-1/1-1.2' all) modemdata=$(omr-modemmanager '/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb1/1-1/1-1.2' all)
gen=$(echo $modemdata | cut -d ';' -f 5 | tr -d '\n') gen=$(echo $modemdata | cut -d ';' -f 5 | tr -d '\n')
if [ "$gen" = "gsm" ]; then if [ "$gen" = "gsm" ]; then

2
openmptcprouter/files/etc/firewall.omr-server
View file

@ -8,7 +8,7 @@ _enable_firewall_check() {
set openmptcprouter.${server}.set_firewall=1 set openmptcprouter.${server}.set_firewall=1
EOF EOF
} }
logger -t "firewall.omr-server" "Firewall reload, set server part firewall reloading"
config_load openmptcprouter config_load openmptcprouter
config_foreach _enable_firewall_check server config_foreach _enable_firewall_check server
uci -q commit firewall uci -q commit firewall

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

@ -357,18 +357,10 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then
set network.modem1.force_link='1' set network.modem1.force_link='1'
set network.modem1.device='/sys/devices/platform/soc/60f8800.usb2/6000000.dwc3/xhci-hcd.1.auto/usb3/3-1' set network.modem1.device='/sys/devices/platform/soc/60f8800.usb2/6000000.dwc3/xhci-hcd.1.auto/usb3/3-1'
set network.modem1.peerdns='0' set network.modem1.peerdns='0'
set network.wan_modem1=interface set network.modem1.multipath='on'
set network.wan_modem1.proto='dhcp' set network.modem1.defaultroute='0'
set network.wan_modem1.device='wwan0'
set network.wan_modem1.force_link='1'
set network.wan_modem1.multipath='on'
set network.wan_modem1.addlatency='0'
set network.wan_modem1.hostname='*'
set network.wan_modem1.defaultroute='0'
set network.wan_modem1.peerdns='0'
set network.wan_modem1.ip4table=wan
commit network commit network
add_list firewall.@zone[1].network='wan_modem1' add_list firewall.@zone[1].network='modem1'
commit firewall commit firewall
EOF EOF
if [ "$(mnf_info -n)" = "RUTX1200XXXX" ]; then if [ "$(mnf_info -n)" = "RUTX1200XXXX" ]; then
@ -382,18 +374,11 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then
set network.modem2.force_link='1' 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.modem2.device='/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb1/1-1/1-1.2'
set network.modem2.peerdns='0' set network.modem2.peerdns='0'
set network.wan_modem2=interface set network.modem2.multipath='on'
set network.wan_modem2.proto='dhcp' set network.modem2.defaultroute='0'
set network.wan_modem2.device='wwan1' set network.modem2.ip4table=wan
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 commit network
add_list firewall.@zone[1].network='wan_modem2' add_list firewall.@zone[1].network='modem2'
commit firewall commit firewall
EOF EOF
fi fi

4
openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
View file

@ -226,12 +226,12 @@ fi
allintf=$(uci -q get firewall.zone_wan.network) allintf=$(uci -q get firewall.zone_wan.network)
uci -q del firewall.zone_wan.network uci -q del firewall.zone_wan.network
for intf in $allintf; do for intf in $allintf; do
uci -q add_list firewall.zone_wan.network=$intf uci -q add_list firewall.zone_wan.network="${intf}"
done done
allintf=$(uci -q get firewall.zone_vpn.network) allintf=$(uci -q get firewall.zone_vpn.network)
uci -q del firewall.zone_vpn.network uci -q del firewall.zone_vpn.network
for intf in $allintf; do for intf in $allintf; do
uci -q add_list firewall.zone_vpn.network=$intf uci -q add_list firewall.zone_vpn.network="${intf}"
done done
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null