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 branch 'test' into develop

Browse source
This commit is contained in:
suyuan 2021-07-20 10:50:48 +08:00
commit ebb22c6e12
7 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
glorytun/glorytun.config
View file

@ -11,4 +11,5 @@ config glorytun 'vpn'
option localip '10.255.255.2' option localip '10.255.255.2'
option remoteip '10.255.255.1' option remoteip '10.255.255.1'
option multiqueue '1' option multiqueue '1'
option label 'Default VPN' option label 'Default VPN'
option timeout '10000'

4
luci-app-glorytun-udp/root/etc/config/glorytun-udp
View file

@ -8,3 +8,7 @@ config glorytun-udp 'vpn'
option localip '10.255.254.2' option localip '10.255.254.2'
option remoteip '10.255.254.1' option remoteip '10.255.254.1'
option mode 'to' option mode 'to'
option mode kxtimeout '7d'
option mode timetolerance '10m'
option mode keepalive '25s'
option mode rateauto '0'

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

@ -152,15 +152,13 @@ start_service() {
del_list dhcp.@dnsmasq[0].server='127.0.0.1#5353' del_list dhcp.@dnsmasq[0].server='127.0.0.1#5353'
add_list dhcp.@dnsmasq[0].server='114.114.114.114' add_list dhcp.@dnsmasq[0].server='114.114.114.114'
set dhcp.@dnsmasq[0].dnsseccheckunsigned='0' set dhcp.@dnsmasq[0].dnsseccheckunsigned='0'
delete dhcp.@dnsmasq[0].dnssec='1' delete dhcp.@dnsmasq[0].dnssec
commit dhcp commit dhcp
EOF EOF
elif [ "$(uci -q get openmptcprouter.settings.country)" = "world" ] && [ -n "$(uci -q get dhcp.@dnsmasq[0].server | grep '114.114.114.114')" ]; then elif [ "$(uci -q get openmptcprouter.settings.country)" = "world" ] && [ -n "$(uci -q get dhcp.@dnsmasq[0].server | grep '114.114.114.114')" ]; then
uci -q batch <<-EOF > /dev/null uci -q batch <<-EOF > /dev/null
add_list dhcp.@dnsmasq[0].server='127.0.0.1#5353' add_list dhcp.@dnsmasq[0].server='127.0.0.1#5353'
del_list dhcp.@dnsmasq[0].server='114.114.114.114' del_list dhcp.@dnsmasq[0].server='114.114.114.114'
set dhcp.@dnsmasq[0].dnsseccheckunsigned='1'
set dhcp.@dnsmasq[0].dnssec='1'
commit dhcp commit dhcp
EOF EOF
fi fi

1
mlvpn/files/etc/config/mlvpn
View file

@ -8,3 +8,4 @@ config mlvpn 'general'
option host '128.128.128.128' option host '128.128.128.128'
option firstport '65201' option firstport '65201'
option interface_name 'mlvpn0' option interface_name 'mlvpn0'
option loss_tolerance '50'

2
mptcp/files/etc/init.d/mptcp
View file

@ -179,7 +179,7 @@ interface_multipath_settings() {
config_get gateway $config gateway config_get gateway $config gateway
config_get netmask $config netmask config_get netmask $config netmask
[ -n "$ipaddr" ] && [ -n "$netmask" ] && netmask=`ipcalc.sh $ipaddr $netmask | sed -n '/PREFIX=/{;s/.*=//;s/ .*//;p;}'` [ -n "$ipaddr" ] && [ -n "$netmask" ] && netmask=`ipcalc.sh $ipaddr $netmask | sed -n '/PREFIX=/{;s/.*=//;s/ .*//;p;}'`
[ -n "$îpaddr" ] && [ -n "$netmask" ] && network=`ipcalc.sh $ipaddr $netmask | sed -n '/NETWORK=/{;s/.*=//;s/ .*//;p;}'` [ -n "$ipaddr" ] && [ -n "$netmask" ] && network=`ipcalc.sh $ipaddr $netmask | sed -n '/NETWORK=/{;s/.*=//;s/ .*//;p;}'`
elif [ "$proto" != "gre" ]; then elif [ "$proto" != "gre" ]; then
network_get_ipaddr ipaddr $config network_get_ipaddr ipaddr $config
[ -z "$ipaddr" ] && ipaddr=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n") [ -z "$ipaddr" ] && ipaddr=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n")

1
openmptcprouter/files/etc/uci-defaults/1940-omr-dns
View file

@ -16,7 +16,6 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
add_list dhcp.@dnsmasq[-1].server="127.0.0.1#5353" add_list dhcp.@dnsmasq[-1].server="127.0.0.1#5353"
add_list dhcp.@dnsmasq[-1].server="8.8.8.8" add_list dhcp.@dnsmasq[-1].server="8.8.8.8"
add_list dhcp.@dnsmasq[-1].server="/lan/" add_list dhcp.@dnsmasq[-1].server="/lan/"
set dhcp.@dnsmasq[-1].dnssec='1'
commit dhcp commit dhcp
EOF EOF
fi fi

5
openmptcprouter/files/etc/uci-defaults/1990-omr-tracker
View file

@ -10,6 +10,11 @@ if [ "$(uci -q get omr-tracker.omrvpn)" = "" ]; then
set omr-tracker.omrvpn.interval=5 set omr-tracker.omrvpn.interval=5
set omr-tracker.omrvpn.mail_alert=0 set omr-tracker.omrvpn.mail_alert=0
set omr-tracker.omrvpn.enabled=1 set omr-tracker.omrvpn.enabled=1
set omr-tracker.omrvpn.wait-test=0
set omr-tracker.omrvpn.server_http_test=1
set omr-tracker.omrvpn.restart_down=0
add_list omr-tracker.omrvpn.hosts='4.2.2.1'
add_list omr-tracker.omrvpn.hosts='8.8.8.8'
commit omr-tracker commit omr-tracker
EOF EOF
fi fi