diff --git a/aliyundrive-webdav/Makefile b/aliyundrive-webdav/Makefile index 58851b47f..e213fd720 100644 --- a/aliyundrive-webdav/Makefile +++ b/aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aliyundrive-webdav -PKG_VERSION:=1.3.0 +PKG_VERSION:=1.3.1 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=MIT diff --git a/luci-app-aliyundrive-webdav/Makefile b/luci-app-aliyundrive-webdav/Makefile index 24fd0386e..8390ac29d 100644 --- a/luci-app-aliyundrive-webdav/Makefile +++ b/luci-app-aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-aliyundrive-webdav -PKG_VERSION:=1.3.0 +PKG_VERSION:=1.3.1 PKG_RELEASE:=1 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 633e4913e..18726412f 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=4.52 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \ diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_hysteria.lua b/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_hysteria.lua index b203e3013..11d9d643c 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_hysteria.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_hysteria.lua @@ -38,6 +38,8 @@ local config = { insecure = (node.tls_allowInsecure == "1") and true or false, up_mbps = tonumber(node.hysteria_up_mbps) or 10, down_mbps = tonumber(node.hysteria_down_mbps) or 50, + retry = -1, + retry_interval = 5, recv_window_conn = (node.hysteria_recv_window_conn) and tonumber(node.hysteria_recv_window_conn) or nil, recv_window = (node.hysteria_recv_window) and tonumber(node.hysteria_recv_window) or nil, disable_mtu_discovery = (node.hysteria_disable_mtu_discovery) and true or false, diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index dac48ab0e..2a1f112fc 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 PKG_VERSION:=1.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \ diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_hysteria.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_hysteria.lua index 723f8caf0..8ddda9202 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_hysteria.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_hysteria.lua @@ -38,6 +38,8 @@ local config = { insecure = (node.tls_allowInsecure == "1") and true or false, up_mbps = tonumber(node.hysteria_up_mbps) or 10, down_mbps = tonumber(node.hysteria_down_mbps) or 50, + retry = -1, + retry_interval = 5, recv_window_conn = (node.hysteria_recv_window_conn) and tonumber(node.hysteria_recv_window_conn) or nil, recv_window = (node.hysteria_recv_window) and tonumber(node.hysteria_recv_window) or nil, disable_mtu_discovery = (node.hysteria_disable_mtu_discovery) and true or false, diff --git a/luci-app-socat/Makefile b/luci-app-socat/Makefile index 7fbcf2fd8..7d23d9eb2 100644 --- a/luci-app-socat/Makefile +++ b/luci-app-socat/Makefile @@ -5,11 +5,19 @@ include $(TOPDIR)/rules.mk +PKG_NAME:=luci-app-socat +PKG_VERSION:=20200824 +PKG_RELEASE:=4 + +PKG_MAINTAINER:=Lienol + LUCI_TITLE:=LuCI support for Socat LUCI_DEPENDS:=+socat LUCI_PKGARCH:=all -PKG_RELEASE:=3 -PKG_DATE:=20200824 + +define Package/$(PKG_NAME)/conffiles +/etc/config/socat +endef include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-socat/luasrc/controller/socat.lua b/luci-app-socat/luasrc/controller/socat.lua index 89b84c323..7a14702d8 100644 --- a/luci-app-socat/luasrc/controller/socat.lua +++ b/luci-app-socat/luasrc/controller/socat.lua @@ -1,19 +1,21 @@ -- Copyright 2020 Lienol module("luci.controller.socat", package.seeall) -local http = require "luci.http" function index() - if not nixio.fs.access("/etc/config/socat") then return end + if not nixio.fs.access("/etc/config/socat") then + return + end - entry({"admin", "network", "socat"}, cbi("socat/index"), _("Socat"), 100) - entry({"admin", "network", "socat", "config"}, cbi("socat/config")).leaf = true - entry({"admin", "network", "socat", "status"}, call("status")).leaf = true + entry({"admin", "network", "socat"}, alias("admin", "network", "socat", "index"), _("Socat"), 100).dependent = true + entry({"admin", "network", "socat", "index"}, cbi("socat/index")).leaf = true + entry({"admin", "network", "socat", "config"}, cbi("socat/config")).leaf = true + entry({"admin", "network", "socat", "status"}, call("act_status")).leaf = true end -function status() - local e = {} - e.index = luci.http.formvalue("index") - e.status = luci.sys.call(string.format("ps -w | grep -v 'grep' | grep '/var/etc/socat/%s' >/dev/null", luci.http.formvalue("id"))) == 0 - http.prepare_content("application/json") - http.write_json(e) +function act_status() + local e = {} + e.index = luci.http.formvalue("index") + e.status = luci.sys.call(string.format("ps -w | grep -v 'grep' | grep '/var/etc/socat/%s' >/dev/null", luci.http.formvalue("id"))) == 0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/luci-app-socat/luasrc/model/cbi/socat/index.lua b/luci-app-socat/luasrc/model/cbi/socat/index.lua index 0bc520e45..c34e52411 100644 --- a/luci-app-socat/luasrc/model/cbi/socat/index.lua +++ b/luci-app-socat/luasrc/model/cbi/socat/index.lua @@ -1,7 +1,9 @@ local d = require "luci.dispatcher" local e = luci.model.uci.cursor() -m = Map("socat", translate("Socat"), translate("Socat is a versatile networking tool named after 'Socket CAT', which can be regarded as an N-fold enhanced version of NetCat")) +m = Map("socat") +m.title = translate("Socat") +m.description = translate("Socat is a versatile networking tool named after 'Socket CAT', which can be regarded as an N-fold enhanced version of NetCat") s = m:section(NamedSection, "global", "global") s.anonymous = true @@ -16,20 +18,20 @@ s.addremove = true s.template = "cbi/tblsection" s.extedit = d.build_url("admin", "network", "socat", "config", "%s") function s.filter(e, t) - if m:get(t, "protocol") == "port_forwards" then - return true - end + if m:get(t, "protocol") == "port_forwards" then + return true + end end function s.create(e, t) - local uuid = string.gsub(luci.sys.exec("echo -n $(cat /proc/sys/kernel/random/uuid)"), "-", "") - t = uuid - TypedSection.create(e, t) - luci.http.redirect(e.extedit:format(t)) + local uuid = string.gsub(luci.sys.exec("echo -n $(cat /proc/sys/kernel/random/uuid)"), "-", "") + t = uuid + TypedSection.create(e, t) + luci.http.redirect(e.extedit:format(t)) end function s.remove(e, t) - e.map.proceed = true - e.map:del(t) - luci.http.redirect(d.build_url("admin", "network", "socat")) + e.map.proceed = true + e.map:del(t) + luci.http.redirect(d.build_url("admin", "network", "socat")) end o = s:option(Flag, "enable", translate("Enable")) @@ -44,23 +46,23 @@ o = s:option(DummyValue, "remarks", translate("Remarks")) o = s:option(DummyValue, "family", translate("Listen Protocol")) o.cfgvalue = function(t, n) - local listen = Value.cfgvalue(t, n) or "" - local protocol = (m:get(n, "proto") or ""):upper() - if listen == "" then - return protocol - else - return "IPv" .. listen .. "-" .. protocol - end + local listen = Value.cfgvalue(t, n) or "" + local protocol = (m:get(n, "proto") or ""):upper() + if listen == "" then + return protocol + else + return "IPv" .. listen .. "-" .. protocol + end end o = s:option(DummyValue, "listen_port", translate("Listen port")) o = s:option(DummyValue, "dest_proto", translate("Destination Protocol")) o.cfgvalue = function(t, n) - local listen = Value.cfgvalue(t, n) - local protocol = listen:sub(0, #listen - 1):upper() - local ip_type = "IPv" .. listen:sub(#listen) - return ip_type .. "-" .. protocol + local listen = Value.cfgvalue(t, n) + local protocol = listen:sub(0, #listen - 1):upper() + local ip_type = "IPv" .. listen:sub(#listen) + return ip_type .. "-" .. protocol end o = s:option(DummyValue, "dest_ip", translate("Destination address")) @@ -72,5 +74,5 @@ o.default = "1" o.rmempty = false m:append(Template("socat/list_status")) -return m +return m diff --git a/luci-app-socat/luasrc/view/socat/list_status.htm b/luci-app-socat/luasrc/view/socat/list_status.htm index 8ffac828e..4da041ed9 100644 --- a/luci-app-socat/luasrc/view/socat/list_status.htm +++ b/luci-app-socat/luasrc/view/socat/list_status.htm @@ -16,4 +16,4 @@ ); } //]]> - \ No newline at end of file + diff --git a/luci-app-socat/luasrc/view/socat/status.htm b/luci-app-socat/luasrc/view/socat/status.htm index 04193e890..241baaec6 100644 --- a/luci-app-socat/luasrc/view/socat/status.htm +++ b/luci-app-socat/luasrc/view/socat/status.htm @@ -1,3 +1,3 @@ <%+cbi/valueheader%> -- -<%+cbi/valuefooter%> \ No newline at end of file +<%+cbi/valuefooter%> diff --git a/luci-app-socat/root/etc/init.d/socat b/luci-app-socat/root/etc/init.d/socat index 579db57f5..1dcbc04ce 100755 --- a/luci-app-socat/root/etc/init.d/socat +++ b/luci-app-socat/root/etc/init.d/socat @@ -116,4 +116,4 @@ stop() { restart() { stop start -} \ No newline at end of file +} diff --git a/natflow/Makefile b/natflow/Makefile index c917b22b1..c5011c9d9 100644 --- a/natflow/Makefile +++ b/natflow/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=natflow -PKG_VERSION:=20220407 +PKG_VERSION:=20220408 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)? PKG_HASH:=skip