update 2022-05-20 16:52:18

aliyundrive-fuse/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aliyundrive-fuse
-PKG_VERSION:=0.1.11
+PKG_VERSION:=0.1.12
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_LICENSE:=MIT

luci-app-aliyundrive-fuse/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-aliyundrive-fuse
-PKG_VERSION:=0.1.11
+PKG_VERSION:=0.1.12
 PKG_RELEASE:=1
 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
 

luci-app-vssr/root/usr/share/vssr/genconfig_v2ray.lua

@@ -22,7 +22,6 @@ function read_conf(file)
     return rtable
 end
 
-
 local v2ray_flow = ucursor:get_first(name, 'global', 'v2ray_flow', '0')
 
 local custom_domain = read_conf("/etc/vssr/custom_domain.list")
@@ -120,28 +119,6 @@ local flow_table = {
     }
 }
 
-local bt_rules = {
-    type = 'field',
-    outboundTag = 'bt',
-    protocol = {
-        'bittorrent'
-    }
-}
-local bt_rules1 = {
-    type = 'field',
-    outboundTag = 'bt',
-    domain = {
-        'torrent',
-        'peer_id=',
-        'info_hash',
-        'get_peers',
-        'find_node',
-        'BitTorrent',
-        'announce_peer',
-        'announce.php?passkey='
-    }
-}
-
 function gen_outbound(server_node, tags, local_ports)
     local bound = {}
     if server_node == nil or server_node == 'nil' then
@@ -224,17 +201,6 @@ function gen_outbound(server_node, tags, local_ports)
     return bound
 end
 
-function gen_bt_outbounds()
-    local bound = {
-        tag = 'bt',
-        protocol = 'freedom',
-        settings = {
-            a = 1
-        }
-    }
-    return bound
-end
-
 if v2ray_flow == '1' then
 
     table.insert(outbounds_table, gen_outbound(server_section, 'global', 2080))
@@ -266,10 +232,6 @@ else
     table.insert(outbounds_table, gen_outbound(server_section, 'main', local_port))
 end
 
-table.insert(outbounds_table, gen_bt_outbounds())
-table.insert(rules_table, bt_rules)
-table.insert(rules_table, bt_rules1)
-
 local v2ray = {
     log = {
         -- error = "/var/vssrsss.log",

luci-theme-argon/htdocs/luci-static/argon/less/cascade.less

@@ -1544,6 +1544,10 @@ tr>th,
     gap: 2px;
 }
 
+.control-group > * {
+    vertical-align: middle;
+}
+
 div>table>tbody>tr:nth-of-type(2n),
 div>.table>.tr:nth-of-type(2n) {
     background-color: #f9f9f9;
@@ -1958,7 +1962,10 @@ td>table>tbody>tr>td,
     background-color: #f9f9f9;
 }
 
-.cbi-value-field,
+.cbi-value-field {
+    display: table-cell;
+}
+
 .cbi-value-description {
     line-height: 1.25;
     display: table-cell;
@@ -2760,6 +2767,11 @@ td>.ifacebadge,
 /* config changes */
 .uci-change-list {
     font-family: monospace;
+    overflow: scroll;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
 }
 
 .uci-change-list ins,

natflow/files/natflow-boot.init

@@ -3,9 +3,25 @@
 
 START=95
 
+disable_gro() {
+	which ethtool || return 0
+	for eth in $(ifconfig | grep "^eth\|^dsa" | awk '{print $1}' | sort | uniq); do
+		ethtool -K "$eth" gro off
+		logger -t natfflow "disable gro for <$eth>"
+	done
+}
+
 start() {
-	echo debug=3 >/dev/natflow_ctl
-	echo disabled=0 >/dev/natflow_ctl
+	disable_gro
+	hwnat=$(uci get natflow.main.hwnat 2>/dev/null || echo 1)
+	enabled=$(uci get natflow.main.enabled 2>/dev/null || echo 1)
+	debug=$(uci get natflow.main.debug 2>/dev/null || echo 3)
+	delay_pkts=$(uci get natflow.main.delay_pkts 2>/dev/null || echo 0)
+
+	echo debug=$debug >/dev/natflow_ctl
+	echo disabled=$((!enabled)) >/dev/natflow_ctl
+	echo hwnat=$hwnat >/dev/natflow_ctl
+	echo delay_pkts=$delay_pkts >/dev/natflow_ctl
 }
 
 stop() {

natflow/files/natflow.config

@@ -1,5 +1,11 @@
+config natflow 'main'
+	option hwnat '1'
+	option enabled '1'
+	option debug '3'
+	option delay_pkts '0'
+
 config globals 'globals'
-	option redirect_ip '10.10.10.10'
+	option redirect_ip '10.10.10.1'
 	option no_flow_timeout '1800'
 
 config auth