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

fix 172 glorytun ip

Browse source
This commit is contained in:
suyuan 2023-03-20 16:22:30 +08:00
parent a7b6d1d849
commit 2fb43a2c39
6 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glorytun/glorytun.config
View file

@ -8,8 +8,8 @@ config glorytun 'vpn'
option proto 'tcp' option proto 'tcp'
option chacha20 '1' option chacha20 '1'
option mtuauto '1' option mtuauto '1'
option localip '10.255.255.2' option localip '172.255.255.2'
option remoteip '10.255.255.1' option remoteip '172.255.255.1'
option multiqueue '1' option multiqueue '1'
option label 'Default VPN' option label 'Default VPN'
option timeout '10000' option timeout '10000'

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

@ -5,8 +5,8 @@ config glorytun-udp 'vpn'
option dev 'tun0' option dev 'tun0'
option key '' option key ''
option chacha '1' option chacha '1'
option localip '10.255.254.2' option localip '172.255.254.2'
option remoteip '10.255.254.1' option remoteip '172.255.254.1'
option mode 'to' option mode 'to'
option kxtimeout '7d' option kxtimeout '7d'
option timetolerance '10m' option timetolerance '10m'

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

@ -879,10 +879,10 @@ function wizard_add()
ucic:set("glorytun","vpn","mptcp",1) ucic:set("glorytun","vpn","mptcp",1)
if default_vpn == "glorytun_tcp" then if default_vpn == "glorytun_tcp" then
ucic:set("glorytun","vpn","proto","tcp") ucic:set("glorytun","vpn","proto","tcp")
ucic:set("glorytun","vpn","localip","10.255.255.2") ucic:set("glorytun","vpn","localip","172.255.255.2")
ucic:set("glorytun","vpn","remoteip","10.255.255.1") ucic:set("glorytun","vpn","remoteip","172.255.255.1")
ucic:set("network","omr6in4","ipaddr","10.255.255.2") ucic:set("network","omr6in4","ipaddr","172.255.255.2")
ucic:set("network","omr6in4","peeraddr","10.255.255.1") ucic:set("network","omr6in4","peeraddr","172.255.255.1")
ucic:set("network","omrvpn","proto","none") ucic:set("network","omrvpn","proto","none")
end end
else else
@ -904,10 +904,10 @@ function wizard_add()
ucic:set("glorytun-udp","vpn","port","65001") ucic:set("glorytun-udp","vpn","port","65001")
ucic:set("glorytun-udp","vpn","key",glorytun_key) ucic:set("glorytun-udp","vpn","key",glorytun_key)
if default_vpn == "glorytun_udp" then if default_vpn == "glorytun_udp" then
ucic:set("glorytun-udp","vpn","localip","10.255.254.2") ucic:set("glorytun-udp","vpn","localip","172.255.254.2")
ucic:set("glorytun-udp","vpn","remoteip","10.255.254.1") ucic:set("glorytun-udp","vpn","remoteip","172.255.254.1")
ucic:set("network","omr6in4","ipaddr","10.255.254.2") ucic:set("network","omr6in4","ipaddr","172.255.254.2")
ucic:set("network","omr6in4","peeraddr","10.255.254.1") ucic:set("network","omr6in4","peeraddr","172.255.254.1")
ucic:set("network","omrvpn","proto","none") ucic:set("network","omrvpn","proto","none")
end end
else else

16
luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
View file

@ -238,16 +238,16 @@ function default_vpn(default_vpn)
ucic:set("network","omrvpn","proto","none") ucic:set("network","omrvpn","proto","none")
if default_vpn == "glorytun_udp" then if default_vpn == "glorytun_udp" then
ucic:set("glorytun","vpn","proto","udp") ucic:set("glorytun","vpn","proto","udp")
ucic:set("glorytun","vpn","localip","10.255.254.2") ucic:set("glorytun","vpn","localip","172.255.254.2")
ucic:set("glorytun","vpn","remoteip","10.255.254.1") ucic:set("glorytun","vpn","remoteip","172.255.254.1")
ucic:set("network","omr6in4","ipaddr","10.255.254.2") ucic:set("network","omr6in4","ipaddr","172.255.254.2")
ucic:set("network","omr6in4","peeraddr","10.255.254.1") ucic:set("network","omr6in4","peeraddr","172.255.254.1")
else else
ucic:set("glorytun","vpn","proto","tcp") ucic:set("glorytun","vpn","proto","tcp")
ucic:set("glorytun","vpn","localip","10.255.255.2") ucic:set("glorytun","vpn","localip","172.255.255.2")
ucic:set("glorytun","vpn","remoteip","10.255.255.1") ucic:set("glorytun","vpn","remoteip","172.255.255.1")
ucic:set("network","omr6in4","ipaddr","10.255.255.2") ucic:set("network","omr6in4","ipaddr","172.255.255.2")
ucic:set("network","omr6in4","peeraddr","10.255.255.1") ucic:set("network","omr6in4","peeraddr","172.255.255.1")
end end
elseif default_vpn == "dsvpn" then elseif default_vpn == "dsvpn" then
vpn_port = 65011 vpn_port = 65011

16
luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter.bak
View file

@ -238,16 +238,16 @@ function default_vpn(default_vpn)
ucic:set("network","omrvpn","proto","none") ucic:set("network","omrvpn","proto","none")
if default_vpn == "glorytun_udp" then if default_vpn == "glorytun_udp" then
ucic:set("glorytun","vpn","proto","udp") ucic:set("glorytun","vpn","proto","udp")
ucic:set("glorytun","vpn","localip","10.255.254.2") ucic:set("glorytun","vpn","localip","172.255.254.2")
ucic:set("glorytun","vpn","remoteip","10.255.254.1") ucic:set("glorytun","vpn","remoteip","172.255.254.1")
ucic:set("network","omr6in4","ipaddr","10.255.254.2") ucic:set("network","omr6in4","ipaddr","172.255.254.2")
ucic:set("network","omr6in4","peeraddr","10.255.254.1") ucic:set("network","omr6in4","peeraddr","172.255.254.1")
else else
ucic:set("glorytun","vpn","proto","tcp") ucic:set("glorytun","vpn","proto","tcp")
ucic:set("glorytun","vpn","localip","10.255.255.2") ucic:set("glorytun","vpn","localip","172.255.255.2")
ucic:set("glorytun","vpn","remoteip","10.255.255.1") ucic:set("glorytun","vpn","remoteip","172.255.255.1")
ucic:set("network","omr6in4","ipaddr","10.255.255.2") ucic:set("network","omr6in4","ipaddr","172.255.255.2")
ucic:set("network","omr6in4","peeraddr","10.255.255.1") ucic:set("network","omr6in4","peeraddr","172.255.255.1")
end end
elseif default_vpn == "dsvpn" then elseif default_vpn == "dsvpn" then
vpn_port = 65011 vpn_port = 65011

4
omr-6in4/files/etc/uci-defaults/9010-omr-6in4
View file

@ -8,8 +8,8 @@ if [ "$(uci -q show network | grep omr6in4)" = "" ]; then
set network.omr6in4.proto=6in4 set network.omr6in4.proto=6in4
set network.omr6in4.ip4table=vpn set network.omr6in4.ip4table=vpn
set network.omr6in4.multipath=off set network.omr6in4.multipath=off
set network.omr6in4.ipaddr=10.255.255.2 set network.omr6in4.ipaddr=172.255.255.2
set network.omr6in4.peeraddr=10.255.255.1 set network.omr6in4.peeraddr=172.255.255.1
set network.omr6in4.gateway=fe80::a00:1 set network.omr6in4.gateway=fe80::a00:1
set network.omr6in4.ip6addr='fe80::a00:2/128' set network.omr6in4.ip6addr='fe80::a00:2/128'
set network.omr6in4.auto='0' set network.omr6in4.auto='0'