mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-24 06:44:21 +00:00
Code Issues Releases Wiki Activity

sync (#433)

Browse source
This commit is contained in:
suyuan 2024-02-08 09:29:39 +08:00 committed by GitHub
commit 3a83d144e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 40 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
omr-schedule/files/usr/share/omr/schedule.d/010-services
View file

@ -165,12 +165,12 @@ multipath_fix() {
config_load network
config_foreach multipath_fix interface
if [ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
if [ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.168.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
_log "Can't find omr-tracker-ss for Shadowsocks libev, restart omr-tracker..."
/etc/init.d/omr-tracker restart 2>&1 >/dev/null
fi
if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.rust.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.rust.server)" != "192.168.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
_log "Can't find omr-tracker-ss for Shadowsocks Rust, restart omr-tracker..."
/etc/init.d/omr-tracker restart 2>&1 >/dev/null
fi

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

@ -128,28 +128,31 @@ elif [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)"
EOF
fi
if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep z8102ax)" ] && [ -z "$(uci show system | grep modem1)" ]; then
uci -q batch <<-EOF >/dev/null
add system led
set system.@led[-1].name='modem1'
set system.@led[-1].sysfs='4g:status'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='wwan0'
add_list system.@led[-1].mode='link'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
add system led
set system.@led[-1].name='modem2'
set system.@led[-1].sysfs='4g2:status'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='wwan1'
add_list system.@led[-1].mode='link'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
commit system
EOF
fi
#if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep z8102ax)" ] && [ -z "$(uci show system | grep modem1)" ]; then
# uci -q batch <<-EOF >/dev/null
# add system led
# set system.@led[-1].name='modem1'
# set system.@led[-1].sysfs='modem1:status'
# set system.@led[-1].trigger='netdev'
# set system.@led[-1].dev='wwan0'
# add_list system.@led[-1].mode='link'
# add_list system.@led[-1].mode='tx'
# add_list system.@led[-1].mode='rx'
# add system led
# set system.@led[-1].name='modem2'
# set system.@led[-1].sysfs='modem2:status'
# set system.@led[-1].trigger='netdev'
# set system.@led[-1].dev='wwan1'
# add_list system.@led[-1].mode='link'
# 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
#service keepalived stop 2>&1 >/dev/null
#service keepalived disabled 2>&1 >/dev/null
exit 0

4
xray-core/Makefile
View file

@ -20,8 +20,8 @@ include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/openmptcprouter/golang/golang-package.mk
define Package/$(PKG_NAME)/template
SECTION:=Custom
CATEGORY:=Extra packages
SECTION:=net
CATEGORY:=Network
TITLE:=Xray-core
DEPENDS:=$(GO_ARCH_DEPENDS)
endef

18
z8102/files/etc/init.d/z8102
View file

@ -16,36 +16,42 @@ start_service()
#echo $i > /sys/class/gpio/export
#echo "out" > /sys/class/gpio/gpio${i}/direction
#echo "0" > /sys/class/gpio/gpio${i}/value
gpioset `gpiofind "sim1"`=0
echo "0" > /sys/class/gpio/sim1/value
#gpioset `gpiofind "sim1"`=0
# sim 2
#i=462
#echo $i > /sys/class/gpio/export
#echo "out" > /sys/class/gpio/gpio${i}/direction
#echo "0" > /sys/class/gpio/gpio${i}/value
gpioset `gpiofind "sim2"`=0
echo "0" > /sys/class/gpio/sim2/value
#gpioset `gpiofind "sim2"`=0
# stop modem 1
#i=459
#echo $i > /sys/class/gpio/export
#echo "out" > /sys/class/gpio/gpio${i}/direction
#echo "0" > /sys/class/gpio/gpio${i}/value
gpioset `gpiofind "modem1"`=0
echo "0" > /sys/class/gpio/modem1/value
#gpioset `gpiofind "modem1"`=0
# stop modem 2
#i=460
#echo $i > /sys/class/gpio/export
#echo "out" > /sys/class/gpio/gpio${i}/direction
#echo "0" > /sys/class/gpio/gpio${i}/value
gpioset `gpiofind "modem2"`=0
echo "0" > /sys/class/gpio/modem2/value
#gpioset `gpiofind "modem2"`=0
sleep 1
# run modem 1
#i=459
#echo "1" > /sys/class/gpio/gpio${i}/value
gpioset `gpiofind "modem1"`=1
echo "1" > /sys/class/gpio/modem1/value
#gpioset `gpiofind "modem1"`=1
sleep 3
# run modem 2
#i=460
#echo "1" > /sys/class/gpio/gpio${i}/value
gpioset `gpiofind "modem2"`=1
echo "1" > /sys/class/gpio/modem2/value
#gpioset `gpiofind "modem2"`=1
}