mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #233 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2022-04-18 13:54:20 +08:00 committed by GitHub
commit 849d374a30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 153 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
luci-app-openmptcprouter/root/bin/omr-modemmanager
View file

@ -10,7 +10,7 @@ timeout 1 mmcli -L | while read MODEM; do
OPERATOR=$(echo "$MODEM_INFO" | grep 'modem.3gpp.operator-name ' | awk -F": " '{print $2}')
NUMBER=$(echo "$MODEM_INFO" | grep 'modem.generic.own-numbders.value[1]' | awk -F": " '{print $2}')
STATE=$(echo "$MODEM_INFO" | grep 'modem.generic.state ' | awk -F": " '{print $2}')
TYPE=$(echo "$MODEM_INFO" | grep 'modem.generic.access-technologies.values[1]' | awk -F": " '{print $2}')
TYPE=$(echo "$MODEM_INFO" | grep 'modem.generic.access-technologies.value\[1\]' | awk -F": " '{print $2}')
[ -z "$INFO" ] && echo $PERCENT
[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$STATE;$TYPE"
exit

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

@ -704,6 +704,95 @@ default_gw6=$(ip -6 route show default | grep -v "metric" | awk '/default/ {prin
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
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
echo "default-on" > /sys/class/leds/mob_gen_2/trigger
echo "none" > /sys/class/leds/mob_gen_3/trigger
echo "none" > /sys/class/leds/mob_gen_4/trigger
elif [ "$gen" = "umts" ]; then
echo "none" > /sys/class/leds/mob_gen_2/trigger
echo "default-on" > /sys/class/leds/mob_gen_3/trigger
echo "none" > /sys/class/leds/mob_gen_4/trigger
elif [ "$gen" = "lte" ]; then
echo "none" > /sys/class/leds/mob_gen_2/trigger
echo "none" > /sys/class/leds/mob_gen_3/trigger
echo "default-on" > /sys/class/leds/mob_gen_4/trigger
fi
bar=$(echo $modemdata | cut -d ';' -f 1 | tr -d '\n')
if [ "$bar" -gt "0" ]; then
echo "default-on" > /sys/class/leds/mob_ssid_1/trigger
else
echo "none" > /sys/class/leds/mob_ssid_1/trigger
fi
if [ "$bar" -gt "30" ]; then
echo "default-on" > /sys/class/leds/mob_ssid_2/trigger
else
echo "none" > /sys/class/leds/mob_ssid_2/trigger
fi
if [ "$bar" -gt "50" ]; then
echo "default-on" > /sys/class/leds/mob_ssid_3/trigger
else
echo "none" > /sys/class/leds/mob_ssid_3/trigger
fi
if [ "$bar" -gt "70" ]; then
echo "default-on" > /sys/class/leds/mob_ssid_4/trigger
else
echo "none" > /sys/class/leds/mob_ssid_4/trigger
fi
if [ "$bar" -gt "90" ]; then
echo "default-on" > /sys/class/leds/mob_ssid_5/trigger
else
echo "none" > /sys/class/leds/mob_ssid_5/trigger
fi
elif [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.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
echo "default-on" > /sys/class/leds/mob2_gen_2/trigger
echo "none" > /sys/class/leds/mob2_gen_3/trigger
echo "none" > /sys/class/leds/mob2_gen_4/trigger
elif [ "$gen" = "umts" ]; then
echo "none" > /sys/class/leds/mob2_gen_2/trigger
echo "default-on" > /sys/class/leds/mob2_gen_3/trigger
echo "none" > /sys/class/leds/mob2_gen_4/trigger
elif [ "$gen" = "lte" ]; then
echo "none" > /sys/class/leds/mob2_gen_2/trigger
echo "none" > /sys/class/leds/mob2_gen_3/trigger
echo "default-on" > /sys/class/leds/mob2_gen_4/trigger
fi
bar=$(echo $modemdata | cut -d ';' -f 1 | tr -d '\n')
if [ "$bar" -gt "0" ]; then
echo "default-on" > /sys/class/leds/mob2_ssid_1/trigger
else
echo "none" > /sys/class/leds/mob2_ssid_1/trigger
fi
if [ "$bar" -gt "30" ]; then
echo "default-on" > /sys/class/leds/mob2_ssid_2/trigger
else
echo "none" > /sys/class/leds/mob2_ssid_2/trigger
fi
if [ "$bar" -gt "50" ]; then
echo "default-on" > /sys/class/leds/mob2_ssid_3/trigger
else
echo "none" > /sys/class/leds/mob2_ssid_3/trigger
fi
if [ "$bar" -gt "70" ]; then
echo "default-on" > /sys/class/leds/mob2_ssid_4/trigger
else
echo "none" > /sys/class/leds/mob2_ssid_4/trigger
fi
if [ "$bar" -gt "90" ]; then
echo "default-on" > /sys/class/leds/mob2_ssid_5/trigger
else
echo "none" > /sys/class/leds/mob2_ssid_5/trigger
fi
fi
fi
# An interface in error will never be used in MPTCP
if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
if [ "$interface_up" = "true" ] && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]); then
@ -1576,7 +1665,6 @@ if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter
sleep 5
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\')" != "" ]; then
_log "Set firewall on server"

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

@ -97,8 +97,8 @@ elif [ "$(swconfig list 2>&1 | grep switch0)" != "" ] && [ "$(cat /etc/board.jso
set network.@switch_vlan[0].ports='1t 2t 3t 4t 0t'
set network.@switch_vlan[1]=switch_vlan
set network.@switch_vlan[1].device='switch0'
set network.@switch_vlan[1].vlan=1
set network.@switch_vlan[1].ports='5 0'
set network.@switch_vlan[1].vlan=2
set network.@switch_vlan[1].ports='0 5'
add network switch_vlan
set network.@switch_vlan[2].device='switch0'
set network.@switch_vlan[2].vlan=3
@ -352,6 +352,7 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then
set network.modem1.addlatency='0'
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'
@ -376,6 +377,7 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then
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.modem2.peerdns='0'
set network.wan_modem2=interface
set network.wan_modem2.proto='dhcp'
set network.wan_modem2.device='wwan1'
@ -391,6 +393,19 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then
commit firewall
EOF
fi
uci -q batch <<-EOF
set network.wifi24=interface
set network.wifi24.proto='none'
set network.wifi5=interface
set network.wifi5.proto='none'
commit network
set wireless.radio0.cell_density='0'
set wireless.default_radio0.network='wifi24'
set wireless.radio1.cell_density='0'
set wireless.default_radio1.network='wifi5'
commit wireless
EOF
fi

45
openmptcprouter/files/etc/uci-defaults/2060-omr-system
View file

@ -38,6 +38,51 @@ fi
EOF
}
if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ]; then
uci -q batch <<-EOF >/dev/null
add system led
set system.@led[-1].sysfs='wan_wifi_4'
set system.@led[-1].name='WAN_ETH'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='eth0'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
add system led
set system.@led[-1].sysfs='wan_eth_3'
set system.@led[-1].name='WAN_WIFI'
set system.@led[-1].trigger='netdev'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
add system led
set system.@led[-1].sysfs='wan_sim_1'
set system.@led[-1].name='WAN_MODEM1'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='wwan0'
set system.@led[-1].mode='rx'
add system led
set system.@led[-1].name='WAN_MODEM2'
set system.@led[-1].sysfs='wan_sim_2'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='wwan1'
set system.@led[-1].mode='rx'
add system led
set system.@led[-1].name='WIFI24'
set system.@led[-1].sysfs='wifi_gen_2'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='radio0.network1'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
add system led
set system.@led[-1].name='WIFI5'
set system.@led[-1].sysfs='wifi_gen_5'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='radio1.network1'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
commit system
EOF
fi
#sed -i 's/^\tlogger -t/\t[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] \&\& logger -t/g' /usr/share/ModemManager/modemmanager.common
exit 0

2
shadowsocks-v2ray-plugin/Makefile
View file

@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git
#PKG_SOURCE_URL:=https://github.com/shadowsocks/v2ray-plugin.git
PKG_SOURCE_URL:=https://github.com/teddysun/v2ray-plugin.git
#PKG_SOURCE_VERSION:=63a74bef9e9f639bc199255db9d452d96f01d11a
PKG_SOURCE_VERSION:=6c0c5fb15851e13b36fe2eeaaba97fd27c9d291b
PKG_SOURCE_VERSION:=5cafcf9a0ae316cb268120eb1994adf5255eb7f0
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1