diff --git a/glorytun/glorytun.config b/glorytun/glorytun.config index 78f97090c..1a70e61a8 100755 --- a/glorytun/glorytun.config +++ b/glorytun/glorytun.config @@ -8,8 +8,8 @@ config glorytun 'vpn' option proto 'tcp' option chacha20 '1' option mtuauto '1' - option localip '10.255.255.2' - option remoteip '10.255.255.1' + option localip '172.255.255.2' + option remoteip '172.255.255.1' option multiqueue '1' option label 'Default VPN' option timeout '10000' \ No newline at end of file diff --git a/luci-app-glorytun-udp/root/etc/config/glorytun-udp b/luci-app-glorytun-udp/root/etc/config/glorytun-udp index 431da357a..2c23dd81b 100755 --- a/luci-app-glorytun-udp/root/etc/config/glorytun-udp +++ b/luci-app-glorytun-udp/root/etc/config/glorytun-udp @@ -5,8 +5,8 @@ config glorytun-udp 'vpn' option dev 'tun0' option key '' option chacha '1' - option localip '10.255.254.2' - option remoteip '10.255.254.1' + option localip '172.255.254.2' + option remoteip '172.255.254.1' option mode 'to' option kxtimeout '7d' option timetolerance '10m' diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index be6f36f31..928f4079c 100755 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -879,10 +879,10 @@ function wizard_add() ucic:set("glorytun","vpn","mptcp",1) if default_vpn == "glorytun_tcp" then ucic:set("glorytun","vpn","proto","tcp") - ucic:set("glorytun","vpn","localip","10.255.255.2") - ucic:set("glorytun","vpn","remoteip","10.255.255.1") - ucic:set("network","omr6in4","ipaddr","10.255.255.2") - ucic:set("network","omr6in4","peeraddr","10.255.255.1") + ucic:set("glorytun","vpn","localip","172.255.255.2") + ucic:set("glorytun","vpn","remoteip","172.255.255.1") + ucic:set("network","omr6in4","ipaddr","172.255.255.2") + ucic:set("network","omr6in4","peeraddr","172.255.255.1") ucic:set("network","omrvpn","proto","none") end else @@ -904,10 +904,10 @@ function wizard_add() ucic:set("glorytun-udp","vpn","port","65001") ucic:set("glorytun-udp","vpn","key",glorytun_key) if default_vpn == "glorytun_udp" then - ucic:set("glorytun-udp","vpn","localip","10.255.254.2") - ucic:set("glorytun-udp","vpn","remoteip","10.255.254.1") - ucic:set("network","omr6in4","ipaddr","10.255.254.2") - ucic:set("network","omr6in4","peeraddr","10.255.254.1") + ucic:set("glorytun-udp","vpn","localip","172.255.254.2") + ucic:set("glorytun-udp","vpn","remoteip","172.255.254.1") + ucic:set("network","omr6in4","ipaddr","172.255.254.2") + ucic:set("network","omr6in4","peeraddr","172.255.254.1") ucic:set("network","omrvpn","proto","none") end else diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter index e6222a3ac..600dd9f7a 100755 --- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter +++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter @@ -238,16 +238,16 @@ function default_vpn(default_vpn) ucic:set("network","omrvpn","proto","none") if default_vpn == "glorytun_udp" then ucic:set("glorytun","vpn","proto","udp") - ucic:set("glorytun","vpn","localip","10.255.254.2") - ucic:set("glorytun","vpn","remoteip","10.255.254.1") - ucic:set("network","omr6in4","ipaddr","10.255.254.2") - ucic:set("network","omr6in4","peeraddr","10.255.254.1") + ucic:set("glorytun","vpn","localip","172.255.254.2") + ucic:set("glorytun","vpn","remoteip","172.255.254.1") + ucic:set("network","omr6in4","ipaddr","172.255.254.2") + ucic:set("network","omr6in4","peeraddr","172.255.254.1") else ucic:set("glorytun","vpn","proto","tcp") - ucic:set("glorytun","vpn","localip","10.255.255.2") - ucic:set("glorytun","vpn","remoteip","10.255.255.1") - ucic:set("network","omr6in4","ipaddr","10.255.255.2") - ucic:set("network","omr6in4","peeraddr","10.255.255.1") + ucic:set("glorytun","vpn","localip","172.255.255.2") + ucic:set("glorytun","vpn","remoteip","172.255.255.1") + ucic:set("network","omr6in4","ipaddr","172.255.255.2") + ucic:set("network","omr6in4","peeraddr","172.255.255.1") end elseif default_vpn == "dsvpn" then vpn_port = 65011 diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter.bak b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter.bak index 9981f0a38..50d47f147 100755 --- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter.bak +++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter.bak @@ -238,16 +238,16 @@ function default_vpn(default_vpn) ucic:set("network","omrvpn","proto","none") if default_vpn == "glorytun_udp" then ucic:set("glorytun","vpn","proto","udp") - ucic:set("glorytun","vpn","localip","10.255.254.2") - ucic:set("glorytun","vpn","remoteip","10.255.254.1") - ucic:set("network","omr6in4","ipaddr","10.255.254.2") - ucic:set("network","omr6in4","peeraddr","10.255.254.1") + ucic:set("glorytun","vpn","localip","172.255.254.2") + ucic:set("glorytun","vpn","remoteip","172.255.254.1") + ucic:set("network","omr6in4","ipaddr","172.255.254.2") + ucic:set("network","omr6in4","peeraddr","172.255.254.1") else ucic:set("glorytun","vpn","proto","tcp") - ucic:set("glorytun","vpn","localip","10.255.255.2") - ucic:set("glorytun","vpn","remoteip","10.255.255.1") - ucic:set("network","omr6in4","ipaddr","10.255.255.2") - ucic:set("network","omr6in4","peeraddr","10.255.255.1") + ucic:set("glorytun","vpn","localip","172.255.255.2") + ucic:set("glorytun","vpn","remoteip","172.255.255.1") + ucic:set("network","omr6in4","ipaddr","172.255.255.2") + ucic:set("network","omr6in4","peeraddr","172.255.255.1") end elseif default_vpn == "dsvpn" then vpn_port = 65011 diff --git a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 index 56ca8b282..73569c6a9 100755 --- a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 +++ b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 @@ -8,8 +8,8 @@ if [ "$(uci -q show network | grep omr6in4)" = "" ]; then set network.omr6in4.proto=6in4 set network.omr6in4.ip4table=vpn set network.omr6in4.multipath=off - set network.omr6in4.ipaddr=10.255.255.2 - set network.omr6in4.peeraddr=10.255.255.1 + set network.omr6in4.ipaddr=172.255.255.2 + set network.omr6in4.peeraddr=172.255.255.1 set network.omr6in4.gateway=fe80::a00:1 set network.omr6in4.ip6addr='fe80::a00:2/128' set network.omr6in4.auto='0'