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

Browse source 
sync
This commit is contained in:
suyuan 2021-04-27 09:12:23 +08:00 • committed by GitHub
commit 5bc8d47300
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 272 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -1100,13 +1100,21 @@ _set_vps_firewall() {
vpsfwlist=$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')
settings='{"name" : "open router"}'
fw_list=$(_set_json "shorewalllist" "$settings")
vpsfwlist="$vpsfwlist\n$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
if [ -n "$vpsfwlist" ]; then
vpsfwlist="$vpsfwlist\n$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
else
vpsfwlist="$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
fi
settings='{"name" : "redirect router","ipproto" : "ipv6"}'
fw6_list=$(_set_json "shorewalllist" "$settings")
vpsfw6list=$(echo $fw6_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')
settings='{"name" : "open router","ipproto" : "ipv6"}'
fw6_list=$(_set_json "shorewalllist" "$settings")
vpsfw6list="$vpsfw6list\n$(echo $fw6_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
if [ -n "$vpsfw6list" ]; then
vpsfw6list="$vpsfw6list\n$(echo $fw6_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
else
vpsfw6list="$(echo $fw6_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
fi
config_load firewall
config_foreach _vps_firewall_redirect_port redirect
config_foreach _vps_firewall_redirect_port rule

36
openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
View file

@ -74,24 +74,24 @@ if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then
fi
fi
#if [ "$(uci -q get sqm.omrvpn)" = "" ]; then
# uci -q batch <<-EOF >/dev/null
# set sqm.omrvpn=queue
# set sqm.omrvpn.qdisc="fq_codel"
# set sqm.omrvpn.script="simple.qos"
# set sqm.omrvpn.qdisc_advanced='0'
# set sqm.omrvpn.linklayer='none'
# set sqm.omrvpn.enabled='1'
# set sqm.omrvpn.interface=tun0
# set sqm.omrvpn.download='0'
# set sqm.omrvpn.upload='0'
# set sqm.omrvpn.debug_logging='0'
# set sqm.omrvpn.verbosity='5'
# set sqm.omrvpn.iqdisc_opts='autorate-ingress dual-dsthost'
# set sqm.omrvpn.eqdisc_opts='dual-srchost'
# commit sqm
# EOF
#fi
if [ "$(uci -q get sqm.omrvpn)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set sqm.omrvpn=queue
set sqm.omrvpn.qdisc="cake"
set sqm.omrvpn.script="piece_of_cake.qos"
set sqm.omrvpn.qdisc_advanced='0'
set sqm.omrvpn.linklayer='none'
set sqm.omrvpn.enabled='1'
set sqm.omrvpn.interface=tun0
set sqm.omrvpn.download='0'
set sqm.omrvpn.upload='0'
set sqm.omrvpn.debug_logging='0'
set sqm.omrvpn.verbosity='5'
set sqm.omrvpn.overhead='40'
set sqm.omrvpn.iqdisc_opts='autorate-ingress'
commit sqm
EOF
fi
rm -f /tmp/luci-indexcache