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

Add A Dead Simple VPN

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-08-02 22:37:45 +02:00
parent cfe790f601
commit bf39d8706e
10 changed files with 668 additions and 384 deletions
Download patch file Download diff file Expand all files Collapse all files

45
dsvpn/Makefile Normal file
View file

@ -0,0 +1,45 @@
#
# Copyright (C) 2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/jedisct1/dsvpn.git
PKG_SOURCE_VERSION:=917910d5f66a6d9f3302931c9d34e0a255979cf0
PKG_NAME:=dsvpn
PKG_VERSION:=0.1.0-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
SECTION:=net
CATEGORY:=Network
DEPENDS:=+kmod-tun
TITLE:=A Dead Simple VPN
URL:=https://github.com/jedisct1/dsvpn
SUBMENU:=VPN
endef
define Package/$(PKG_NAME)/conffiles
/etc/config/dsvpn
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dsvpn $(1)/usr/sbin/$(PKG_NAME)
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) init $(1)/etc/init.d/$(PKG_NAME)
$(INSTALL_DIR) $(1)/etc/config
touch $(1)/etc/config/dsvpn
endef
$(eval $(call BuildPackage,$(PKG_NAME)))

84
dsvpn/init Executable file
View file

@ -0,0 +1,84 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project
START=90
STOP=10
USE_PROCD=1
PROG_NAME=dsvpn
PROG=/usr/sbin/${PROG_NAME}
_log() {
logger -p daemon.info -t ${PROG_NAME} "$@"
}
_err() {
logger -p daemon.err -t ${PROG_NAME} "$@"
}
validate_section() {
uci_validate_section dsvpn dsvpn "${1}" \
'enable:bool:0' \
'key:string' \
'host:host' \
'port:port' \
'dev:string' \
'localip:host' \
'remoteip:host'
}
start_instance() {
local enable key host port dev
validate_section "${1}" || {
_err "validation failed"
return 1
}
[ "${enable}" = "1" ] || return 1
[ -n "${key}" ] || return 1
[ "${key}" != "secretkey" ] || return 1
[ -n "${port}" ] || return 1
[ -n "${dev}" ] || return 1
echo "${key}" > /tmp/${PROG_NAME}-${1}.key
key=""
if [ "$(uci -q get network.omrvpn)" != "" ]; then
uci -q set network.omrvpn.ifname=$dev
uci -q commit
fi
_log "starting ${PROG_NAME} ${1} instance $*"
procd_open_instance
procd_set_param command ${PROG} client \
/tmp/${PROG_NAME}-${1}.key \
$host \
$port \
$dev \
${localip:+$localip} \
${remoteip:+$remoteip}
procd_set_param respawn 0 30 0
procd_set_param file /tmp/${PROG_NAME}-${1}.key
procd_set_param stdout 1
procd_set_param stderr 1
procd_close_instance
}
start_service() {
config_load dsvpn
config_foreach start_instance dsvpn
}
service_triggers() {
procd_add_reload_trigger dsvpn network
}

2
luci-app-omr-dscp/root/etc/config/dscp
View file

@ -22,7 +22,7 @@ config classify
option direction 'both' option direction 'both'
option proto 'tcp' option proto 'tcp'
option class 'cs6' option class 'cs6'
option dest_port '65001,65301' option dest_port '65001,65301,65011'
option comment 'OMR vpn' option comment 'OMR vpn'
config classify config classify

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

@ -278,6 +278,10 @@ function wizard_add()
vpn_port = 65201 vpn_port = 65201
vpn_intf = "mlvpn0" vpn_intf = "mlvpn0"
ucic:set("network","omrvpn","proto","dhcp") ucic:set("network","omrvpn","proto","dhcp")
elseif default_vpn == "dsvpn" then
vpn_port = 65011
vpn_intf = "tun0"
ucic:set("network","omrvpn","proto","none")
elseif default_vpn == "openvpn" then elseif default_vpn == "openvpn" then
vpn_port = 65301 vpn_port = 65301
vpn_intf = "tun0" vpn_intf = "tun0"
@ -363,6 +367,7 @@ function wizard_add()
end end
ucic:set("shadowsocks-libev","sss0","server",server_ip) ucic:set("shadowsocks-libev","sss0","server",server_ip)
ucic:set("glorytun","vpn","host",server_ip) ucic:set("glorytun","vpn","host",server_ip)
ucic:set("dsvpn","vpn","host",server_ip)
ucic:set("mlvpn","general","host",server_ip) ucic:set("mlvpn","general","host",server_ip)
luci.sys.call("uci -q del openvpn.omr.remote") luci.sys.call("uci -q del openvpn.omr.remote")
luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip) luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip)
@ -379,6 +384,8 @@ function wizard_add()
ucic:commit("openvpn") ucic:commit("openvpn")
ucic:save("mlvpn") ucic:save("mlvpn")
ucic:commit("mlvpn") ucic:commit("mlvpn")
ucic:save("dsvpn")
ucic:commit("dsvpn")
ucic:save("glorytun") ucic:save("glorytun")
ucic:commit("glorytun") ucic:commit("glorytun")
ucic:save("shadowsocks-libev") ucic:save("shadowsocks-libev")
@ -438,6 +445,29 @@ function wizard_add()
ucic:save("glorytun") ucic:save("glorytun")
ucic:commit("glorytun") ucic:commit("glorytun")
-- Set A Dead Simple VPN settings
if default_vpn == "dsvpn" then
ucic:set("dsvpn","vpn","enable",1)
else
ucic:set("dsvpn","vpn","enable",0)
end
local dsvpn_key = luci.http.formvalue("dsvpn_key")
if dsvpn_key ~= "" then
ucic:set("dsvpn","vpn","port","65011")
ucic:set("dsvpn","vpn","key",dsvpn_key)
ucic:set("glorytun","vpn","localip","10.255.251.2")
ucic:set("glorytun","vpn","remoteip","10.255.251.1")
ucic:set("network","omr6in4","ipaddr","10.255.251.2")
ucic:set("network","omr6in4","peeraddr","10.255.251.1")
ucic:set("network","omrvpn","proto","none")
else
ucic:set("dsvpn","vpn","key","")
ucic:set("dsvpn","vpn","enable",0)
end
ucic:save("dsvpn")
ucic:commit("dsvpn")
-- Set MLVPN settings -- Set MLVPN settings
if default_vpn == "mlvpn" then if default_vpn == "mlvpn" then
ucic:set("mlvpn","general","enable",1) ucic:set("mlvpn","general","enable",1)
@ -509,6 +539,7 @@ function wizard_add()
os.execute("sleep 2") os.execute("sleep 2")
end end
luci.sys.call("/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/dsvpn restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null")
--luci.sys.call("/etc/init.d/mlvpn restart >/dev/null 2>/dev/null") --luci.sys.call("/etc/init.d/mlvpn restart >/dev/null 2>/dev/null")
@ -879,7 +910,7 @@ function interfaces_status()
mArray.openmptcprouter["tun_service"] = false mArray.openmptcprouter["tun_service"] = false
mArray.openmptcprouter["tun_state"] = "" mArray.openmptcprouter["tun_state"] = ""
mArray.openmptcprouter["tun6_state"] = "" mArray.openmptcprouter["tun6_state"] = ""
if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?mlvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?openvpn?$'"), "%d+") then if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?mlvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?openvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?dsvpn?$'"), "%d+") then
mArray.openmptcprouter["tun_service"] = true mArray.openmptcprouter["tun_service"] = true
mArray.openmptcprouter["tun_ip"] = get_ip("omrvpn") mArray.openmptcprouter["tun_ip"] = get_ip("omrvpn")
local tun_dev = uci:get("network","omrvpn","ifname") local tun_dev = uci:get("network","omrvpn","ifname")

2
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -146,7 +146,7 @@
} }
if (mArray.openmptcprouter.tun_service == false) if (mArray.openmptcprouter.tun_service == false)
{ {
statusMessage += _('GloryTUN is not running') + '<br/>'; statusMessage += _('VPN is not running') + '<br/>';
} }
if (mArray.openmptcprouter.dns == false) if (mArray.openmptcprouter.dns == false)
{ {

15
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -164,6 +164,18 @@ end
</div> </div>
</div> </div>
<% end %> <% end %>
<% if nixio.fs.access("/usr/sbin/dsvpn") then %>
<div class="cbi-value">
<label class="cbi-value-title"><%:A Dead Simple VPN key%></label>
<div class="cbi-value-field">
<input type="text" name="dsvpn_key" placeholder="A Dead Simple VPN key" class="cbi-input-text" value="<%=uci:get("dsvpn","vpn","key")%>">
<br />
<div class="cbi-value-description">
<%:A Dead Simple VPN is a TCP VPN that can replace Glorytun TCP%>
</div>
</div>
</div>
<% end %>
<% if nixio.fs.access("/usr/sbin/mlvpn") then %> <% if nixio.fs.access("/usr/sbin/mlvpn") then %>
<div class="cbi-value"> <div class="cbi-value">
<label class="cbi-value-title"><%:MLVPN password%></label> <label class="cbi-value-title"><%:MLVPN password%></label>
@ -205,6 +217,8 @@ end
<% if nixio.fs.access("/usr/sbin/glorytun") then %><option value="glorytun_tcp" <% if uci:get("glorytun","vpn","enable") == "1" and uci:get("glorytun","vpn","proto") == "tcp" then %>selected="selected"<% end %>>Glorytun TCP</option><% end %> <% if nixio.fs.access("/usr/sbin/glorytun") then %><option value="glorytun_tcp" <% if uci:get("glorytun","vpn","enable") == "1" and uci:get("glorytun","vpn","proto") == "tcp" then %>selected="selected"<% end %>>Glorytun TCP</option><% end %>
<% elseif vpn == "glorytun-udp" then %> <% elseif vpn == "glorytun-udp" then %>
<% if nixio.fs.access("/usr/sbin/glorytun-udp") then %><option value="glorytun_udp" <% if uci:get("glorytun","vpn","enable") == "1" and uci:get("glorytun","vpn","proto") == "udp" then %>selected="selected"<% end %>>Glorytun UDP</option><% end %> <% if nixio.fs.access("/usr/sbin/glorytun-udp") then %><option value="glorytun_udp" <% if uci:get("glorytun","vpn","enable") == "1" and uci:get("glorytun","vpn","proto") == "udp" then %>selected="selected"<% end %>>Glorytun UDP</option><% end %>
<% elseif vpn == "dsvpn" then %>
<% if nixio.fs.access("/usr/sbin/dsvpn") then %><option value="dsvpn" <% if uci:get("dsvpn","vpn","enable") == "1" then %>selected="selected"<% end %>>A Dead Simple VPN</option><% end %>
<% elseif vpn == "mlvpn" then %> <% elseif vpn == "mlvpn" then %>
<% if nixio.fs.access("/usr/sbin/mlvpn") then %><option value="mlvpn" <% if uci:get("mlvpn","general","enable") == "1" then %>selected="selected"<% end %>>MLVPN</option><% end %> <% if nixio.fs.access("/usr/sbin/mlvpn") then %><option value="mlvpn" <% if uci:get("mlvpn","general","enable") == "1" then %>selected="selected"<% end %>>MLVPN</option><% end %>
<% elseif vpn == "openvpn" then %> <% elseif vpn == "openvpn" then %>
@ -219,6 +233,7 @@ end
%> %>
<% if nixio.fs.access("/usr/sbin/glorytun") then %><option value="glorytun_tcp" <% if uci:get("glorytun","vpn","enable") == "1" and uci:get("glorytun","vpn","proto") == "tcp" then %>selected="selected"<% end %>>Glorytun TCP</option><% end %> <% if nixio.fs.access("/usr/sbin/glorytun") then %><option value="glorytun_tcp" <% if uci:get("glorytun","vpn","enable") == "1" and uci:get("glorytun","vpn","proto") == "tcp" then %>selected="selected"<% end %>>Glorytun TCP</option><% end %>
<% if nixio.fs.access("/usr/sbin/glorytun-udp") then %><option value="glorytun_udp" <% if uci:get("glorytun","vpn","enable") == "1" and uci:get("glorytun","vpn","proto") == "udp" then %>selected="selected"<% end %>>Glorytun UDP</option><% end %> <% if nixio.fs.access("/usr/sbin/glorytun-udp") then %><option value="glorytun_udp" <% if uci:get("glorytun","vpn","enable") == "1" and uci:get("glorytun","vpn","proto") == "udp" then %>selected="selected"<% end %>>Glorytun UDP</option><% end %>
<% if nixio.fs.access("/usr/sbin/dsvpn") then %><option value="dsvpn" <% if uci:get("dsvpn","vpn","enable") == "1" then %>selected="selected"<% end %>>A Dead Simple VPN</option><% end %>
<% if nixio.fs.access("/usr/sbin/mlvpn") then %><option value="mlvpn" <% if uci:get("mlvpn","general","enable") == "1" then %>selected="selected"<% end %>>MLVPN</option><% end %> <% if nixio.fs.access("/usr/sbin/mlvpn") then %><option value="mlvpn" <% if uci:get("mlvpn","general","enable") == "1" then %>selected="selected"<% end %>>MLVPN</option><% end %>
<% if nixio.fs.access("/usr/sbin/openvpn") then %><option value="openvpn" <% if uci:get("openvpn","omr","enabled") == "1" then %>selected="selected"<% end %>>OpenVPN</option><% end %> <% if nixio.fs.access("/usr/sbin/openvpn") then %><option value="openvpn" <% if uci:get("openvpn","omr","enabled") == "1" then %>selected="selected"<% end %>>OpenVPN</option><% end %>
<option value="none" <% if uci:get("openmptcprouter","settings","vpn") == "none" then %>selected="selected"<% end %>>None</option> <option value="none" <% if uci:get("openmptcprouter","settings","vpn") == "none" then %>selected="selected"<% end %>>None</option>

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

@ -20,221 +20,196 @@ function interface_from_device(dev)
return "" return ""
end end
function wizard_add() function add_server(add_server_name)
local gostatus = true ucic:set("openmptcprouter",add_server_name:gsub("[^%w_]+","_"),"server")
-- Add new server ucic:save("openmptcprouter")
local add_server = luci.http.formvalue("add_server") or "" ucic:commit("openmptcprouter")
local add_server_name = luci.http.formvalue("add_server_name") or "" end
if add_server ~= "" and add_server_name ~= "" then
ucic:set("openmptcprouter",add_server_name:gsub("[^%w_]+","_"),"server")
gostatus = false
end
function remove_server(serverdel)
-- Remove existing server -- Remove existing server
local delete_server = luci.http.formvaluetable("deleteserver") or "" ucic:foreach("network", "interface", function(s)
if delete_server ~= "" then local sectionname = s[".name"]
for serverdel, _ in pairs(delete_server) do ucic:delete("network","server_" .. serverdel .. "_" .. sectionname .. "_route")
ucic:foreach("network", "interface", function(s) end)
local sectionname = s[".name"] ucic:delete("network","server_" .. serverdel .. "_default_route")
ucic:delete("network","server_" .. serverdel .. "_" .. sectionname .. "_route") ucic:delete("openmptcprouter",serverdel)
end) ucic:save("openmptcprouter")
ucic:delete("network","server_" .. serverdel .. "_default_route") ucic:commit("openmptcprouter")
ucic:delete("openmptcprouter",serverdel) ucic:save("network")
ucic:save("openmptcprouter") ucic:commit("network")
ucic:commit("openmptcprouter") end
ucic:save("network")
ucic:commit("network")
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/wizard"))
return
end
end
function add_interface(add_interface_ifname)
-- Add new interface -- Add new interface
local add_interface = luci.http.formvalue("add_interface") or "" local i = 1
local add_interface_ifname = luci.http.formvalue("add_interface_ifname") or "" local multipath_master = false
if add_interface ~= "" then ucic:foreach("network", "interface", function(s)
local i = 1 local sectionname = s[".name"]
local multipath_master = false if sectionname:match("^wan(%d+)$") then
ucic:foreach("network", "interface", function(s) i = i + 1
local sectionname = s[".name"]
if sectionname:match("^wan(%d+)$") then
i = i + 1
end
if ucic:get("network",sectionname,"multipath") == "master" then
multipath_master = true
end
end)
local defif = "eth0"
if add_interface_ifname == "" then
local defif1 = ucic:get("network","wan1_dev","ifname") or ""
if defif1 ~= "" then
defif = defif1
end
else
defif = add_interface_ifname
end end
if ucic:get("network",sectionname,"multipath") == "master" then
local ointf = interface_from_device(defif) or "" multipath_master = true
local wanif = defif
if ointf ~= "" then
if ucic:get("network",ointf,"type") == "" then
ucic:set("network",ointf,"type","macvlan")
end
wanif = "wan" .. i
end end
end)
ucic:set("network","wan" .. i,"interface") local defif = "eth0"
ucic:set("network","wan" .. i,"ifname",defif) if add_interface_ifname == "" then
ucic:set("network","wan" .. i,"proto","static") local defif1 = ucic:get("network","wan1_dev","ifname") or ""
if ointf ~= "" then if defif1 ~= "" then
ucic:set("network","wan" .. i,"type","macvlan") defif = defif1
end end
ucic:set("network","wan" .. i,"ip4table","wan") else
if multipath_master then defif = add_interface_ifname
ucic:set("network","wan" .. i,"multipath","on")
else
ucic:set("network","wan" .. i,"multipath","master")
end
ucic:set("network","wan" .. i,"defaultroute","0")
ucic:reorder("network","wan" .. i, i + 2)
ucic:save("network")
ucic:commit("network")
ucic:set("qos","wan" .. i,"interface")
ucic:set("qos","wan" .. i,"classgroup","Default")
ucic:set("qos","wan" .. i,"enabled","0")
ucic:set("qos","wan" .. i,"upload","4000")
ucic:set("qos","wan" .. i,"download","100000")
ucic:save("qos")
ucic:commit("qos")
ucic:set("sqm","wan" .. i,"queue")
if ointf ~= "" then
ucic:set("sqm","wan" .. i,"interface","wan" .. i)
else
ucic:set("sqm","wan" .. i,"interface",defif)
end
ucic:set("sqm","wan" .. i,"qdisc","fq_codel")
ucic:set("sqm","wan" .. i,"script","simple.qos")
ucic:set("sqm","wan" .. i,"qdisc_advanced","0")
ucic:set("sqm","wan" .. i,"linklayer","none")
ucic:set("sqm","wan" .. i,"enabled","0")
ucic:set("sqm","wan" .. i,"debug_logging","0")
ucic:set("sqm","wan" .. i,"verbosity","5")
ucic:set("sqm","wan" .. i,"download","0")
ucic:set("sqm","wan" .. i,"upload","0")
ucic:save("sqm")
ucic:commit("sqm")
luci.sys.call("uci -q add_list vnstat.@vnstat[-1].interface=" .. wanif)
luci.sys.call("uci -q commit vnstat")
-- Dirty way to add new interface to firewall...
luci.sys.call("uci -q add_list firewall.@zone[1].network=wan" .. i)
luci.sys.call("uci -q commit firewall")
luci.sys.call("/etc/init.d/macvlan restart >/dev/null 2>/dev/null")
gostatus = false
end end
local ointf = interface_from_device(defif) or ""
local wanif = defif
if ointf ~= "" then
if ucic:get("network",ointf,"type") == "" then
ucic:set("network",ointf,"type","macvlan")
end
wanif = "wan" .. i
end
ucic:set("network","wan" .. i,"interface")
ucic:set("network","wan" .. i,"ifname",defif)
ucic:set("network","wan" .. i,"proto","static")
if ointf ~= "" then
ucic:set("network","wan" .. i,"type","macvlan")
end
ucic:set("network","wan" .. i,"ip4table","wan")
if multipath_master then
ucic:set("network","wan" .. i,"multipath","on")
else
ucic:set("network","wan" .. i,"multipath","master")
end
ucic:set("network","wan" .. i,"defaultroute","0")
ucic:reorder("network","wan" .. i, i + 2)
ucic:save("network")
ucic:commit("network")
ucic:set("qos","wan" .. i,"interface")
ucic:set("qos","wan" .. i,"classgroup","Default")
ucic:set("qos","wan" .. i,"enabled","0")
ucic:set("qos","wan" .. i,"upload","4000")
ucic:set("qos","wan" .. i,"download","100000")
ucic:save("qos")
ucic:commit("qos")
ucic:set("sqm","wan" .. i,"queue")
if ointf ~= "" then
ucic:set("sqm","wan" .. i,"interface","wan" .. i)
else
ucic:set("sqm","wan" .. i,"interface",defif)
end
ucic:set("sqm","wan" .. i,"qdisc","fq_codel")
ucic:set("sqm","wan" .. i,"script","simple.qos")
ucic:set("sqm","wan" .. i,"qdisc_advanced","0")
ucic:set("sqm","wan" .. i,"linklayer","none")
ucic:set("sqm","wan" .. i,"enabled","0")
ucic:set("sqm","wan" .. i,"debug_logging","0")
ucic:set("sqm","wan" .. i,"verbosity","5")
ucic:set("sqm","wan" .. i,"download","0")
ucic:set("sqm","wan" .. i,"upload","0")
ucic:save("sqm")
ucic:commit("sqm")
luci.sys.call("uci -q add_list vnstat.@vnstat[-1].interface=" .. wanif)
luci.sys.call("uci -q commit vnstat")
-- Dirty way to add new interface to firewall...
luci.sys.call("uci -q add_list firewall.@zone[1].network=wan" .. i)
luci.sys.call("uci -q commit firewall")
luci.sys.call("/etc/init.d/macvlan restart >/dev/null 2>/dev/null")
end
function remove_interface(intf)
-- Remove existing interface -- Remove existing interface
local delete_intf = luci.http.formvaluetable("delete") or "" local defif = ucic:get("network",intf,"ifname")
if delete_intf ~= "" then ucic:delete("network",intf)
for intf, _ in pairs(delete_intf) do ucic:delete("network",intf .. "_dev")
local defif = ucic:get("network",intf,"ifname") ucic:save("network")
ucic:delete("network",intf) ucic:commit("network")
ucic:delete("network",intf .. "_dev") ucic:delete("sqm",intf)
ucic:save("network") ucic:save("sqm")
ucic:commit("network") ucic:commit("sqm")
ucic:delete("sqm",intf) ucic:delete("qos",intf)
ucic:save("sqm") ucic:save("qos")
ucic:commit("sqm") ucic:commit("qos")
ucic:delete("qos",intf) if defif ~= nil and defif ~= "" then
ucic:save("qos") luci.sys.call("uci -q del_list vnstat.@vnstat[-1].interface=" .. defif)
ucic:commit("qos")
if defif ~= nil and defif ~= "" then
luci.sys.call("uci -q del_list vnstat.@vnstat[-1].interface=" .. defif)
end
luci.sys.call("uci -q commit vnstat")
luci.sys.call("uci -q del_list firewall.@zone[1].network=" .. intf)
luci.sys.call("uci -q commit firewall")
gostatus = false
end
end end
luci.sys.call("uci -q commit vnstat")
luci.sys.call("uci -q del_list firewall.@zone[1].network=" .. intf)
luci.sys.call("uci -q commit firewall")
end
function set_interface(intf,proto,ipaddr,netmask,gateway,sqmenabled,downloadspeed,uploadspeed)
-- Set interfaces settings -- Set interfaces settings
local interfaces = luci.http.formvaluetable("intf") if proto ~= "other" then
for intf, _ in pairs(interfaces) do ucic:set("network",intf,"proto",proto)
local proto = luci.http.formvalue("cbid.network.%s.proto" % intf) or "static"
local ipaddr = luci.http.formvalue("cbid.network.%s.ipaddr" % intf) or ""
local netmask = luci.http.formvalue("cbid.network.%s.netmask" % intf) or ""
local gateway = luci.http.formvalue("cbid.network.%s.gateway" % intf) or ""
local sqmenabled = luci.http.formvalue("cbid.sqm.%s.enabled" % intf) or "0"
if proto ~= "other" then
ucic:set("network",intf,"proto",proto)
end
ucic:set("network",intf,"ipaddr",ipaddr)
ucic:set("network",intf,"netmask",netmask)
ucic:set("network",intf,"gateway",gateway)
ucic:delete("openmptcprouter",intf,"lc")
ucic:save("openmptcprouter")
local downloadspeed = luci.http.formvalue("cbid.sqm.%s.download" % intf) or "0"
local uploadspeed = luci.http.formvalue("cbid.sqm.%s.upload" % intf) or "0"
if not ucic:get("qos",intf) ~= "" then
ucic:set("qos",intf,"interface")
ucic:set("qos",intf,"classgroup","Default")
ucic:set("qos",intf,"enabled","0")
ucic:set("qos",intf,"upload","4000")
ucic:set("qos",intf,"download","100000")
end
if not ucic:get("sqm",intf) ~= "" then
local defif = get_device(intf)
if defif == "" then
defif = ucic:get("network",intf,"ifname") or ""
end
ucic:set("sqm",intf,"queue")
ucic:set("sqm",intf,"interface",defif)
ucic:set("sqm",intf,"qdisc","fq_codel")
ucic:set("sqm",intf,"script","simple.qos")
ucic:set("sqm",intf,"qdisc_advanced","0")
ucic:set("sqm",intf,"linklayer","none")
ucic:set("sqm",intf,"enabled","0")
ucic:set("sqm",intf,"debug_logging","0")
ucic:set("sqm",intf,"verbosity","5")
ucic:set("sqm",intf,"download","0")
ucic:set("sqm",intf,"upload","0")
end
if downloadspeed ~= "0" and uploadspeed ~= "0" then
ucic:set("network",intf,"downloadspeed",downloadspeed)
ucic:set("network",intf,"uploadspeed",uploadspeed)
ucic:set("sqm",intf,"download",math.ceil(downloadspeed*95/100))
ucic:set("sqm",intf,"upload",math.ceil(uploadspeed*95/100))
if sqmenabled == "1" then
ucic:set("sqm",intf,"enabled","1")
else
ucic:set("sqm",intf,"enabled","0")
end
ucic:set("qos",intf,"download",math.ceil(downloadspeed*95/100))
ucic:set("qos",intf,"upload",math.ceil(uploadspeed*95/100))
if sqmenabled == "1" then
ucic:set("qos",intf,"enabled","1")
else
ucic:set("qos",intf,"enabled","0")
end
else
ucic:set("sqm",intf,"download","0")
ucic:set("sqm",intf,"upload","0")
ucic:set("sqm",intf,"enabled","0")
ucic:set("qos",intf,"download","0")
ucic:set("qos",intf,"upload","0")
ucic:set("qos",intf,"enabled","0")
end
end end
ucic:set("network",intf,"ipaddr",ipaddr)
ucic:set("network",intf,"netmask",netmask)
ucic:set("network",intf,"gateway",gateway)
ucic:delete("openmptcprouter",intf,"lc")
ucic:save("openmptcprouter")
if not ucic:get("qos",intf) ~= "" then
ucic:set("qos",intf,"interface")
ucic:set("qos",intf,"classgroup","Default")
ucic:set("qos",intf,"enabled","0")
ucic:set("qos",intf,"upload","4000")
ucic:set("qos",intf,"download","100000")
end
if not ucic:get("sqm",intf) ~= "" then
local defif = get_device(intf)
if defif == "" then
defif = ucic:get("network",intf,"ifname") or ""
end
ucic:set("sqm",intf,"queue")
ucic:set("sqm",intf,"interface",defif)
ucic:set("sqm",intf,"qdisc","fq_codel")
ucic:set("sqm",intf,"script","simple.qos")
ucic:set("sqm",intf,"qdisc_advanced","0")
ucic:set("sqm",intf,"linklayer","none")
ucic:set("sqm",intf,"enabled","0")
ucic:set("sqm",intf,"debug_logging","0")
ucic:set("sqm",intf,"verbosity","5")
ucic:set("sqm",intf,"download","0")
ucic:set("sqm",intf,"upload","0")
end
if downloadspeed ~= "0" and uploadspeed ~= "0" then
ucic:set("network",intf,"downloadspeed",downloadspeed)
ucic:set("network",intf,"uploadspeed",uploadspeed)
ucic:set("sqm",intf,"download",math.ceil(downloadspeed*95/100))
ucic:set("sqm",intf,"upload",math.ceil(uploadspeed*95/100))
if sqmenabled == "1" then
ucic:set("sqm",intf,"enabled","1")
else
ucic:set("sqm",intf,"enabled","0")
end
ucic:set("qos",intf,"download",math.ceil(downloadspeed*95/100))
ucic:set("qos",intf,"upload",math.ceil(uploadspeed*95/100))
if sqmenabled == "1" then
ucic:set("qos",intf,"enabled","1")
else
ucic:set("qos",intf,"enabled","0")
end
else
ucic:set("sqm",intf,"download","0")
ucic:set("sqm",intf,"upload","0")
ucic:set("sqm",intf,"enabled","0")
ucic:set("qos",intf,"download","0")
ucic:set("qos",intf,"upload","0")
ucic:set("qos",intf,"enabled","0")
end
-- Disable multipath on LAN, VPN and loopback -- Disable multipath on LAN, VPN and loopback
ucic:set("network","loopback","multipath","off") ucic:set("network","loopback","multipath","off")
ucic:set("network","lan","multipath","off") ucic:set("network","lan","multipath","off")
@ -247,13 +222,10 @@ function wizard_add()
ucic:commit("qos") ucic:commit("qos")
ucic:save("network") ucic:save("network")
ucic:commit("network") ucic:commit("network")
end
-- Enable/disable IPv6 function default_vpn(default_vpn)
local disable_ipv6 = luci.http.formvalue("enableipv6") or "1"
set_ipv6_state(disable_ipv6)
-- Get VPN set by default -- Get VPN set by default
local default_vpn = luci.http.formvalue("default_vpn") or "glorytun_tcp"
local vpn_port = "" local vpn_port = ""
local vpn_intf = "" local vpn_intf = ""
if default_vpn:match("^glorytun.*") then if default_vpn:match("^glorytun.*") then
@ -261,6 +233,28 @@ function wizard_add()
vpn_intf = "tun0" vpn_intf = "tun0"
--ucic:set("network","omrvpn","proto","dhcp") --ucic:set("network","omrvpn","proto","dhcp")
ucic:set("network","omrvpn","proto","none") ucic:set("network","omrvpn","proto","none")
if default_vpn == "glorytun" 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")
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")
end
elseif default_vpn == "dsvpn" then
vpn_port = 65011
vpn_intf = "tun0"
--ucic:set("network","omrvpn","proto","dhcp")
ucic:set("network","omrvpn","proto","none")
ucic:set("dsvpn","vpn","localip","10.255.254.2")
ucic:set("dsvpn","vpn","remoteip","10.255.254.1")
ucic:set("network","omr6in4","ipaddr","10.255.254.2")
ucic:set("network","omr6in4","peeraddr","10.255.254.1")
elseif default_vpn == "mlvpn" then elseif default_vpn == "mlvpn" then
vpn_port = 65201 vpn_port = 65201
vpn_intf = "mlvpn0" vpn_intf = "mlvpn0"
@ -275,34 +269,84 @@ function wizard_add()
ucic:save("network") ucic:save("network")
ucic:commit("network") ucic:commit("network")
end end
-- Set Glorytun settings
if default_vpn:match("^glorytun.*") then
ucic:set("glorytun","vpn","enable",1)
else
ucic:set("glorytun","vpn","enable",0)
end
-- Set A Dead Simple VPN settings
if default_vpn == "dsvpn" then
ucic:set("dsvpn","vpn","enable",1)
else
ucic:set("dsvpn","vpn","enable",0)
end
-- Set MLVPN settings
if default_vpn == "mlvpn" then
ucic:set("mlvpn","general","enable",1)
ucic:set("network","omrvpn","proto","dhcp")
else
ucic:set("mlvpn","general","enable",0)
end
if default_vpn == "openvpn" then
ucic:set("openvpn","omr","enabled",1)
ucic:set("network","omrvpn","proto","dhcp")
else
ucic:set("openvpn","omr","enabled",0)
end
ucic:set("openmptcprouter","settings","vpn",default_vpn)
ucic:save("glorytun")
ucic:commit("glorytun")
ucic:save("mlvpn")
ucic:commit("mlvpn")
ucic:save("dsvpn")
ucic:commit("dsvpn")
ucic:save("openvpn")
ucic:commit("openvpn")
ucic:save("openmptcprouter")
ucic:commit("openmptcprouter")
ucic:save("network")
ucic:commit("network")
-- Retrieve all server settings end
local serversnb = 0
local servers = luci.http.formvaluetable("server")
for server, _ in pairs(servers) do
local server_ip = luci.http.formvalue("%s.server_ip" % server) or ""
local master = luci.http.formvalue("master") or ""
-- OpenMPTCProuter VPS function server_settings(server,server_ip,openmptcprouter_vps_key)
local openmptcprouter_vps_key = luci.http.formvalue("%s.openmptcprouter_vps_key" % server) or "" -- OpenMPTCProuter VPS
ucic:set("openmptcprouter",server,"server") ucic:set("openmptcprouter",server,"server")
ucic:set("openmptcprouter",server,"username","openmptcprouter") ucic:set("openmptcprouter",server,"username","openmptcprouter")
ucic:set("openmptcprouter",server,"password",openmptcprouter_vps_key) ucic:set("openmptcprouter",server,"password",openmptcprouter_vps_key)
if master == server or (master == "" and serversnb == 0) then ucic:set("openmptcprouter",server,"ip",server_ip)
ucic:set("openmptcprouter",server,"get_config","1") ucic:set("openmptcprouter",server,"port","65500")
ucic:set("openmptcprouter",server,"master","1") ucic:save("openmptcprouter")
ucic:set("openmptcprouter",server,"backup","0") ucic:set("shadowsocks-libev","sss0","server",server_ip)
else ucic:set("glorytun","vpn","host",server_ip)
ucic:set("openmptcprouter",server,"get_config","0") ucic:set("dsvpn","vpn","host",server_ip)
ucic:set("openmptcprouter",server,"master","0") ucic:set("mlvpn","general","host",server_ip)
ucic:set("openmptcprouter",server,"backup","1") luci.sys.call("uci -q del openvpn.omr.remote")
end luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip)
ucic:set("openmptcprouter",server,"ip",server_ip) ucic:set("qos","serverin","srchost",server_ip)
ucic:set("openmptcprouter",server,"port","65500") ucic:set("qos","serverout","dsthost",server_ip)
ucic:save("openmptcprouter") ucic:save("qos")
if server_ip ~= "" then ucic:commit("qos")
serversnb = serversnb + 1 ucic:save("mlvpn")
end ucic:commit("mlvpn")
ucic:save("dsvpn")
ucic:commit("dsvpn")
ucic:save("glorytun")
ucic:commit("glorytun")
ucic:save("shadowsocks-libev")
ucic:commit("shadowsocks-libev")
end
function server_failover(server,master)
if master == server or master == "" then
ucic:set("openmptcprouter",server,"get_config","1")
ucic:set("openmptcprouter",server,"master","1")
ucic:set("openmptcprouter",server,"backup","0")
else
ucic:set("openmptcprouter",server,"get_config","0")
ucic:set("openmptcprouter",server,"master","0")
ucic:set("openmptcprouter",server,"backup","1")
end end
local ss_servers_nginx = {} local ss_servers_nginx = {}
@ -311,27 +355,23 @@ function wizard_add()
local k = 0 local k = 0
local ss_ip local ss_ip
for server, _ in pairs(servers) do -- We have an IP, so set it everywhere
local master = luci.http.formvalue("master") or "" if server_ip ~= "" then
local server_ip = luci.http.formvalue("%s.server_ip" % server) or "" -- Check if we have more than one IP, in this case use Nginx HA
-- We have an IP, so set it everywhere if master == server then
if server_ip ~= "" then ss_ip=server_ip
-- Check if we have more than one IP, in this case use Nginx HA table.insert(ss_servers_nginx,server_ip .. ":65101 max_fails=2 fail_timeout=20s")
if serversnb > 1 then table.insert(ss_servers_ha,server_ip .. ":65101 check")
if master == server then if vpn_port ~= "" then
ss_ip=server_ip table.insert(vpn_servers,server_ip .. ":" .. vpn_port .. " max_fails=2 fail_timeout=20s")
table.insert(ss_servers_nginx,server_ip .. ":65101 max_fails=2 fail_timeout=20s") end
table.insert(ss_servers_ha,server_ip .. ":65101 check") else
if vpn_port ~= "" then table.insert(ss_servers_nginx,server_ip .. ":65101 backup")
table.insert(vpn_servers,server_ip .. ":" .. vpn_port .. " max_fails=2 fail_timeout=20s") table.insert(ss_servers_ha,server_ip .. ":65101 backup")
end if vpn_port ~= "" then
else table.insert(vpn_servers,server_ip .. ":" .. vpn_port .. " backup")
table.insert(ss_servers_nginx,server_ip .. ":65101 backup") end
table.insert(ss_servers_ha,server_ip .. ":65101 backup") end
if vpn_port ~= "" then
table.insert(vpn_servers,server_ip .. ":" .. vpn_port .. " backup")
end
end
k = k + 1 k = k + 1
ucic:set("nginx-ha","ShadowSocks","enable","1") ucic:set("nginx-ha","ShadowSocks","enable","1")
ucic:set("nginx-ha","VPN","enable","1") ucic:set("nginx-ha","VPN","enable","1")
@ -350,6 +390,7 @@ function wizard_add()
end end
ucic:set("shadowsocks-libev","sss0","server",server_ip) ucic:set("shadowsocks-libev","sss0","server",server_ip)
ucic:set("glorytun","vpn","host",server_ip) ucic:set("glorytun","vpn","host",server_ip)
ucic:set("dsvpn","vpn","host",server_ip)
ucic:set("mlvpn","general","host",server_ip) ucic:set("mlvpn","general","host",server_ip)
luci.sys.call("uci -q del openvpn.omr.remote") luci.sys.call("uci -q del openvpn.omr.remote")
luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip) luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip)
@ -366,135 +407,81 @@ function wizard_add()
ucic:commit("openvpn") ucic:commit("openvpn")
ucic:save("mlvpn") ucic:save("mlvpn")
ucic:commit("mlvpn") ucic:commit("mlvpn")
ucic:save("dsvpn")
ucic:commit("dsvpn")
ucic:save("glorytun") ucic:save("glorytun")
ucic:commit("glorytun") ucic:commit("glorytun")
ucic:save("shadowsocks-libev") ucic:save("shadowsocks-libev")
ucic:commit("shadowsocks-libev") ucic:commit("shadowsocks-libev")
end
function set_shadowsocks(shadowsocks_key)
-- Set ShadowSocks settings -- Set ShadowSocks settings
local shadowsocks_key = luci.http.formvalue("shadowsocks_key") ucic:set("shadowsocks-libev","sss0","key",shadowsocks_key)
local shadowsocks_disable = luci.http.formvalue("disableshadowsocks") or "0" ucic:save("shadowsocks-libev")
if shadowsocks_key ~= "" then ucic:commit("shadowsocks-libev")
ucic:set("shadowsocks-libev","sss0","key",shadowsocks_key) end
--ucic:set("shadowsocks-libev","sss0","method","chacha20")
--ucic:set("shadowsocks-libev","sss0","server_port","65101")
ucic:set("shadowsocks-libev","sss0","disabled",shadowsocks_disable)
ucic:save("shadowsocks-libev")
ucic:commit("shadowsocks-libev")
else
ucic:set("shadowsocks-libev","sss0","key","")
ucic:set("shadowsocks-libev","sss0","disabled",shadowsocks_disable)
ucic:save("shadowsocks-libev")
ucic:commit("shadowsocks-libev")
luci.sys.call("/etc/init.d/shadowsocks rules_down >/dev/null 2>/dev/null")
end
-- Set Glorytun settings function disable_shadowsocks(shadowsocks_disable)
if default_vpn:match("^glorytun.*") then -- Set ShadowSocks settings
ucic:set("glorytun","vpn","enable",1) ucic:set("shadowsocks-libev","sss0","disabled",shadowsocks_disable)
else ucic:save("shadowsocks-libev")
ucic:set("glorytun","vpn","enable",0) ucic:commit("shadowsocks-libev")
end end
local glorytun_key = luci.http.formvalue("glorytun_key") function set_glorytun(glorytun_key)
if glorytun_key ~= "" then ucic:set("glorytun","vpn","port","65001")
ucic:set("glorytun","vpn","port","65001") ucic:set("glorytun","vpn","key",glorytun_key)
ucic:set("glorytun","vpn","key",glorytun_key) ucic:set("glorytun","vpn","mptcp",1)
ucic:set("glorytun","vpn","mptcp",1) ucic:set("glorytun","vpn","chacha20",1)
ucic:set("glorytun","vpn","chacha20",1)
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")
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")
end
ucic:set("network","omrvpn","proto","none")
else
ucic:set("glorytun","vpn","key","")
ucic:set("glorytun","vpn","enable",0)
ucic:set("glorytun","vpn","proto","tcp")
end
ucic:save("glorytun") ucic:save("glorytun")
ucic:commit("glorytun") ucic:commit("glorytun")
end
function set_dsvpn(dsvpn_key)
ucic:set("dsvpn","vpn","port","65011")
ucic:set("dsvpn","vpn","key",dsvpn_key)
ucic:save("glorytun")
ucic:commit("glorytun")
end
function set_mlvpn(mlvpn_password)
-- Set MLVPN settings -- Set MLVPN settings
if default_vpn == "mlvpn" then
ucic:set("mlvpn","general","enable",1)
ucic:set("network","omrvpn","proto","dhcp")
else
ucic:set("mlvpn","general","enable",0)
end
local mlvpn_password = luci.http.formvalue("mlvpn_password") local mlvpn_password = luci.http.formvalue("mlvpn_password")
if mlvpn_password ~= "" then ucic:set("mlvpn","general","password",mlvpn_password)
ucic:set("mlvpn","general","password",mlvpn_password) ucic:set("mlvpn","general","firstport","65201")
ucic:set("mlvpn","general","firstport","65201") ucic:set("mlvpn","general","interface_name","mlvpn0")
ucic:set("mlvpn","general","interface_name","mlvpn0")
else
--ucic:set("mlvpn","general","enable",0)
ucic:set("mlvpn","general","password","")
end
ucic:save("mlvpn") ucic:save("mlvpn")
ucic:commit("mlvpn") ucic:commit("mlvpn")
end
function set_openvpn(openvpn_key)
-- Set OpenVPN settings -- Set OpenVPN settings
local openvpn_key = luci.http.formvalue("openvpn_key") local openvpn_key_path = "/etc/luci-uploads/openvpn.key"
if openvpn_key ~= "" then local fp
local openvpn_key_path = "/etc/luci-uploads/openvpn.key" luci.http.setfilehandler(
local fp function(meta, chunk, eof)
luci.http.setfilehandler( if not fp and meta and meta.name == "openvpn_key" then
function(meta, chunk, eof) fp = io.open(openvpn_key_path, "w")
if not fp and meta and meta.name == "openvpn_key" then end
fp = io.open(openvpn_key_path, "w") if fp and chunk then
end fp:write(chunk)
if fp and chunk then end
fp:write(chunk) if fp and eof then
end fp:close()
if fp and eof then end
fp:close() end)
end ucic:set("openvpn","omr","secret",openvpn_key_path)
end)
ucic:set("openvpn","omr","secret",openvpn_key_path)
end
if default_vpn == "openvpn" then
ucic:set("openvpn","omr","enabled",1)
ucic:set("network","omrvpn","proto","dhcp")
else
ucic:set("openvpn","omr","enabled",0)
end
ucic:save("openvpn") ucic:save("openvpn")
ucic:commit("openvpn") ucic:commit("openvpn")
ucic:save("network") end
ucic:commit("network")
-- OpenMPTCProuter VPS
--local openmptcprouter_vps_key = luci.http.formvalue("openmptcprouter_vps_key") or ""
--ucic:set("openmptcprouter","vps","username","openmptcprouter")
--ucic:set("openmptcprouter","vps","password",openmptcprouter_vps_key)
--ucic:set("openmptcprouter","vps","get_config","1")
local shadowsocks_disable = luci.http.formvalue("disableshadowsocks") or "0"
ucic:set("openmptcprouter","settings","shadowsocks_disable",shadowsocks_disable)
ucic:set("openmptcprouter","settings","vpn",default_vpn)
ucic:delete("openmptcprouter","settings","master_lcintf")
ucic:save("openmptcprouter")
ucic:commit("openmptcprouter")
function restart_all()
-- Restart all -- Restart all
luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null") luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/mptcp restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/mptcp restart >/dev/null 2>/dev/null")
if openmptcprouter_vps_key ~= "" then luci.sys.call("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null") os.execute("sleep 2")
os.execute("sleep 2")
end
luci.sys.call("/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null")
@ -502,12 +489,6 @@ function wizard_add()
luci.sys.call("/etc/init.d/openvpn restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/openvpn restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/omr-tracker restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/omr-tracker restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null")
if gostatus == true then
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status"))
else
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/wizard"))
end
return
end end
function redirectports(server,redirect_ports) function redirectports(server,redirect_ports)
@ -611,20 +592,17 @@ end
function update_vps() function update_vps()
-- Update VPS -- Update VPS
local update_vps = luci.http.formvalue("flash") or "" ucic:foreach("openmptcprouter", "server", function(s)
if update_vps ~= "" then local serverip = ucic:get("openmptcprouter",s[".name"],"ip")
ucic:foreach("openmptcprouter", "server", function(s) local adminport = ucic:get("openmptcprouter",s[".name"],"port") or "65500"
local serverip = ucic:get("openmptcprouter",s[".name"],"ip") local token = ucic:get("openmptcprouter",s[".name"],"token") or ""
local adminport = ucic:get("openmptcprouter",s[".name"],"port") or "65500" if token ~= "" then
local token = ucic:get("openmptcprouter",s[".name"],"token") or "" sys.exec('curl -4 --max-time 20 -s -k -H "Authorization: Bearer ' .. token .. '" https://' .. serverip .. ":" .. adminport .. "/update")
if token ~= "" then luci.sys.call("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null")
sys.exec('curl -4 --max-time 20 -s -k -H "Authorization: Bearer ' .. token .. '" https://' .. serverip .. ":" .. adminport .. "/update") luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status"))
luci.sys.call("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null") return
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status")) end
return end)
end
end)
end
end end
function get_ip(interface) function get_ip(interface)
@ -703,11 +681,11 @@ function get_gateway(interface)
return gateway return gateway
end end
-- This function come from OverTheBox by OVH with some changes -- This function come from OverTheBox by OVH with many changes
-- Copyright 2015 OVH <OverTheBox@ovh.net> -- Copyright 2015 OVH <OverTheBox@ovh.net>
-- Simon Lelievre (simon.lelievre@corp.ovh.com) -- Simon Lelievre (simon.lelievre@corp.ovh.com)
-- Sebastien Duponcheel <sebastien.duponcheel@ovh.net> -- Sebastien Duponcheel <sebastien.duponcheel@ovh.net>
-- Modified by Ycarus (Yannick Chabanois) <ycarus@zugaina.org> -- Modified by Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project
-- Under GPL3+ -- Under GPL3+
function interfaces_status() function interfaces_status()
local ut = require "luci.util" local ut = require "luci.util"
@ -1386,6 +1364,120 @@ local methods = {
externalcheck(args.externalcheck) externalcheck(args.externalcheck)
end end
}, },
savevnstat = {
args = { savevnstat = 0 },
call = function(args)
savevnstat(args.savevnstat)
end
},
disablefastopen = {
args = { disablefastopen = 0 },
call = function(args)
disablefastopen(args.disablefastopen)
end
},
enableobfs = {
args = { enableobfs = 0 },
call = function(args)
enableobfs(args.enableobfs)
end
},
setmastertype = {
args = { master_type = "redundant" },
call = function(args)
setmastertype(args.setmastertype)
end
},
cpuscalingmin = {
args = { scaling_min_freq = 0 },
call = function(args)
cpuscalingmin(args.scaling_min_freq)
end
},
cpuscalingmax = {
args = { scaling_max_freq = 0 },
call = function(args)
cpuscalingmax(args.scaling_max_freq)
end
},
addserver = {
args = { server_name },
call = function(args)
add_server(args.server_name)
end
},
removeserver = {
args = { server_name },
call = function(args)
remove_server(args.server_name)
end
},
addinterface = {
args = { ifname = "" },
call = function(args)
add_interface(args.ifname)
end
},
removeinterface = {
args = { intf = "" },
call = function(args)
remove_interface(args.intf)
end
},
setinterface = {
args = { intf, proto = "dhcp", ipaddr = "", netmask = "", gateway = "", sqmenabled = 0, downloadspeed = 0, uploadspeed = 0 },
call = function(args)
set_interface(args.intf, args.proto, args.ipaddr, args.netmask, args.gateway, args.sqmenabled, args.downloadspeed, args.uploadspeed)
end
},
defaultvpn = {
args = { vpn = "glorytun-tcp" },
call = function(args)
default_vpn(args.vpn)
end
},
setserver = {
args = { server = "vps", server_ip, openmptcprouter_vps_key },
call = function(args)
server_settings(args.server, args.server_ip, args.openmptcprouter_vps_key)
end
},
setshadowsocks = {
args = { key = "" },
call = function(args)
set_shadowsocks(args.shadowsocks_key)
end
},
disableshadowsocks = {
args = { disable },
call = function(args)
disable_shadowsocks(args.disable)
end
},
setglorytun = {
args = { key = "" },
call = function(args)
set_glorytun(args.key)
end
},
setdsvpn = {
args = { key = "" },
call = function(args)
set_dsvpn(args.key)
end
},
setmlvpn = {
args = { key = "" },
call = function(args)
set_mlvpn(args.key)
end
},
setopenvpn = {
args = { key = "" },
call = function(args)
set_openvpn(args.key)
end
},
} }

4
omr-6in4/files/bin/omr-6in4
View file

@ -6,6 +6,10 @@ while true; do
iface=$(uci -q get glorytun.vpn.dev) iface=$(uci -q get glorytun.vpn.dev)
addr=$(uci -q get glorytun.vpn.localip) addr=$(uci -q get glorytun.vpn.localip)
peer=$(uci -q get glorytun.vpn.remoteip) peer=$(uci -q get glorytun.vpn.remoteip)
elif [ "$(uci -q get dsvpn.vpn.enable)" = "1" ]; then
iface=$(uci -q get dsvpn.vpn.dev)
addr=$(uci -q get dsvpn.vpn.localip)
peer=$(uci -q get dsvpn.vpn.remoteip)
elif [ "$(uci -q get mlvpn.general.enable)" = "1" ]; then elif [ "$(uci -q get mlvpn.general.enable)" = "1" ]; then
iface=$(uci -q get mlvpn.general.interface_name) iface=$(uci -q get mlvpn.general.interface_name)
elif [ "$(uci -q get openvpn.omr.enabled)" = "1" ]; then elif [ "$(uci -q get openvpn.omr.enabled)" = "1" ]; then

1
openmptcprouter-full/Makefile
View file

@ -17,6 +17,7 @@ MY_DEPENDS := \
mptcp \ mptcp \
unbound-daemon unbound-control \ unbound-daemon unbound-control \
netifd \ netifd \
dsvpn \
mc \ mc \
f2fs-tools \ f2fs-tools \
openmptcprouter \ openmptcprouter \

12
openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
View file

@ -38,6 +38,18 @@ if [ "$(uci -q get openvpn.omr)" = "" ]; then
EOF EOF
fi fi
if [ "$(uci -q get dsvpn.vpn)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set dsvpn.vpn=dsvpn
set dsvpn.vpn.dev=tun0
set dsvpn.vpn.port=65011
set dsvpn.vpn.localip=10.255.251.2
set dsvpn.vpn.remoteip=10.255.251.2
set dsvpn.vpn.enabled=0
commit dsvpn
EOF
fi
if [ "$(uci -q show firewall | grep omrvpn)" = "" ]; then if [ "$(uci -q show firewall | grep omrvpn)" = "" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
add_list firewall.zone_vpn.network=omrvpn add_list firewall.zone_vpn.network=omrvpn