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

Browse source 
sync
This commit is contained in:
suyuan 2022-05-30 12:15:48 +08:00 • committed by GitHub
commit 70221e9e85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -167,6 +167,7 @@ function wizard_add()
ucic:set("network","wan" .. i .. "_dev","mode","vepa") ucic:set("network","wan" .. i .. "_dev","mode","vepa")
ucic:set("network","wan" .. i .. "_dev","ifname",defif) ucic:set("network","wan" .. i .. "_dev","ifname",defif)
ucic:set("network","wan" .. i .. "_dev","name","wan" .. i) ucic:set("network","wan" .. i .. "_dev","name","wan" .. i)
ucic:set("network","wan" .. i .. "_dev","txqueuelen","20")
end end
ucic:set("network","wan" .. i,"ip4table","wan") ucic:set("network","wan" .. i,"ip4table","wan")
if multipath_master then if multipath_master then

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

@ -256,7 +256,7 @@
<input type="checkbox" name="disableserverhttptest" class="cbi-input-checkbox" value="1" <% if luci.model.uci.cursor():get("openmptcprouter","settings","disableserverhttptest") == "1" then %>checked<% end %>> <input type="checkbox" name="disableserverhttptest" class="cbi-input-checkbox" value="1" <% if luci.model.uci.cursor():get("openmptcprouter","settings","disableserverhttptest") == "1" then %>checked<% end %>>
<br /> <br />
<div class="cbi-value-description"> <div class="cbi-value-description">
<%:Disable HTTP test on Server API in status page%> <%:Disable HTTP test on Server API%>
</div> </div>
</div> </div>
</div> </div>

2
luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
View file

@ -165,7 +165,7 @@ start_service() {
fi fi
if [ "$(uci -q get openmptcprouter.settings.sfe_enabled)" = "1" ]; then if [ "$(uci -q get openmptcprouter.settings.sfe_enabled)" = "1" ]; then
[ -z "$(lsmod | grep fast_classifier)" ] && modprobe fast_classifier 2>&1 >/dev/null [ -z "$(lsmod | grep fast_classifier)" ] && modprobe -q fast_classifier 2>&1 >/dev/null
if [ "$(uci -q get openmptcprouter.settings.sfe_bridge)" = "1" ]; then if [ "$(uci -q get openmptcprouter.settings.sfe_bridge)" = "1" ]; then
echo 1 >/sys/fast_classifier/skip_to_bridge_ingress echo 1 >/sys/fast_classifier/skip_to_bridge_ingress
else else

1
mptcp/files/usr/bin/multipath
View file

@ -134,6 +134,7 @@ else
ID=$(ip mptcp endpoint show | grep "dev $DEVICE" | awk '{print $3}') ID=$(ip mptcp endpoint show | grep "dev $DEVICE" | awk '{print $3}')
IFF=$(ip mptcp endpoint show | grep "dev $DEVICE" | awk '{print $4}') IFF=$(ip mptcp endpoint show | grep "dev $DEVICE" | awk '{print $4}')
IP=$(ifconfig $DEVICE | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p') IP=$(ifconfig $DEVICE | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p')
[ -z "$ID" ] && ID=$(ip mptcp endpoint show | grep "$IP" | awk '{print $3}')
RMID=$(ip mptcp endpoint show | grep '::ffff' | awk '{ print $3 }') RMID=$(ip mptcp endpoint show | grep '::ffff' | awk '{ print $3 }')
[ -n "$RMID" ] && ip mptcp endpoint delete id $RMID 2>&1 >/dev/null [ -n "$RMID" ] && ip mptcp endpoint delete id $RMID 2>&1 >/dev/null
case $TYPE in case $TYPE in

4
omr-tracker/files/bin/omr-tracker
View file

@ -392,7 +392,7 @@ while true; do
config_load openmptcprouter config_load openmptcprouter
config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP
if [ "$serverip_ping" = false ]; then if [ "$serverip_ping" = false ]; then
OMR_TRACKER_STATUS="ERROR" #OMR_TRACKER_STATUS="ERROR"
OMR_TRACKER_STATUS_MSG="No access to server API" OMR_TRACKER_STATUS_MSG="No access to server API"
else else
OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS_MSG=""
@ -493,7 +493,7 @@ while true; do
config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP
if [ "$serverip_ping" = false ]; then if [ "$serverip_ping" = false ]; then
OMR_TRACKER_STATUS_MSG="No access to server API" OMR_TRACKER_STATUS_MSG="No access to server API"
OMR_TRACKER_STATUS="ERROR" #OMR_TRACKER_STATUS="ERROR"
else else
OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK" OMR_TRACKER_STATUS="OK"

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

@ -22,6 +22,7 @@ _setup_macvlan() {
set network.$1_dev.type=macvlan set network.$1_dev.type=macvlan
set network.$1_dev.ifname=$_ifname set network.$1_dev.ifname=$_ifname
set network.$1_dev.mode='vepa' set network.$1_dev.mode='vepa'
set network.$1_dev.txqueuelen=20
set network.$1.device=$1 set network.$1.device=$1
set network.$1.type=macvlan set network.$1.type=macvlan
set network.$1.masterintf=$_ifname set network.$1.masterintf=$_ifname
@ -64,6 +65,7 @@ _setup_wan_interface() {
set network.$1.defaultroute=0 set network.$1.defaultroute=0
set network.${1}_dev=device set network.${1}_dev=device
set network.${1}_dev.name=$2 set network.${1}_dev.name=$2
set network.${1}_dev.txqueuelen=20
commit network commit network
add_list firewall.@zone[1].network=$1 add_list firewall.@zone[1].network=$1
commit firewall commit firewall