diff --git a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css index 35ad4be96..9dd88fd72 100644 --- a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css +++ b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css @@ -332,4 +332,6 @@ Thanks :)*/ } .spaceline { height: 55px; + z-index: -10; + position: relative; } diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index be05b035e..fe573ae19 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -101,7 +101,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm temp += '
  • '; if (mArray.wans) { - temp += ''; + temp += ''; for( var j = 1; j < mArray.wans.length; j++ ) { temp += ''; diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking index a4f2c2f6f..c2f77fe34 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -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"]') -if [ -n "$(grep RUTX /etc/board.json)" ] && [ -n "$OMR_TRACKER_INTERFACE" ]; then - if [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.device)" = "wwan0" ]; then +if [ -n "$(grep RUTX /etc/board.json)" ] && [ -n "$OMR_TRACKER_DEVICE" ]; 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) gen=$(echo $modemdata | cut -d ';' -f 5 | tr -d '\n') if [ "$gen" = "gsm" ]; then @@ -752,7 +752,7 @@ if [ -n "$(grep RUTX /etc/board.json)" ] && [ -n "$OMR_TRACKER_INTERFACE" ]; the else echo "none" > /sys/class/leds/mob_ssid_5/trigger 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) gen=$(echo $modemdata | cut -d ';' -f 5 | tr -d '\n') if [ "$gen" = "gsm" ]; then diff --git a/openmptcprouter/files/etc/firewall.omr-server b/openmptcprouter/files/etc/firewall.omr-server index a3aaccd16..cbd8d719d 100644 --- a/openmptcprouter/files/etc/firewall.omr-server +++ b/openmptcprouter/files/etc/firewall.omr-server @@ -8,7 +8,7 @@ _enable_firewall_check() { set openmptcprouter.${server}.set_firewall=1 EOF } - +logger -t "firewall.omr-server" "Firewall reload, set server part firewall reloading" config_load openmptcprouter config_foreach _enable_firewall_check server uci -q commit firewall diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network index bdb6a12c7..ee5922803 100755 --- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network +++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network @@ -357,18 +357,10 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then 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.peerdns='0' - set network.wan_modem1=interface - set network.wan_modem1.proto='dhcp' - 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 + set network.modem1.multipath='on' + set network.modem1.defaultroute='0' commit network - add_list firewall.@zone[1].network='wan_modem1' + add_list firewall.@zone[1].network='modem1' commit firewall EOF 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.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.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 + set network.modem2.multipath='on' + set network.modem2.defaultroute='0' + set network.modem2.ip4table=wan commit network - add_list firewall.@zone[1].network='wan_modem2' + add_list firewall.@zone[1].network='modem2' commit firewall EOF fi diff --git a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall index 709eaaf05..3719a41b0 100755 --- a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall +++ b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall @@ -226,12 +226,12 @@ fi allintf=$(uci -q get firewall.zone_wan.network) uci -q del firewall.zone_wan.network for intf in $allintf; do - uci -q add_list firewall.zone_wan.network=$intf + uci -q add_list firewall.zone_wan.network="${intf}" done allintf=$(uci -q get firewall.zone_vpn.network) uci -q del firewall.zone_vpn.network for intf in $allintf; do - uci -q add_list firewall.zone_vpn.network=$intf + uci -q add_list firewall.zone_vpn.network="${intf}" done uci -q batch <<-EOF >/dev/null