From 4bf1bcf7ddebcfc9efbd440c9d5eb1121032f0c5 Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Tue, 24 Sep 2024 12:24:25 +0800
Subject: [PATCH] update 2024-09-24 12:24:25

---
 mihomo/Makefile                 |  8 ++++----
 natflow/Makefile                |  4 ++--
 natflow/files/natflow-boot.init | 14 ++++++++------
 natflow/files/natflow.config    |  5 +++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/mihomo/Makefile b/mihomo/Makefile
index be614bfac..79d970c78 100644
--- a/mihomo/Makefile
+++ b/mihomo/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git
-PKG_SOURCE_DATE:=2024-09-19
-PKG_SOURCE_VERSION:=a08aa10630813485d7899e65ff59c3fae56f8364
-PKG_MIRROR_HASH:=415cafd17a7c3362da952b9c5ecaa8f38d01e79b9609fdbc2384be225ae97451
+PKG_SOURCE_DATE:=2024-09-23
+PKG_SOURCE_VERSION:=59a2b24593fce55244cf3ad3817855b0b1b7f6b3
+PKG_MIRROR_HASH:=3d8848f5b4967e401195cb3ea7a03c97a2b6eeb5c5e625e758e9ba51581c5492
 
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=Joseph Mory <morytyann@gmail.com>
@@ -16,7 +16,7 @@ PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_FLAGS:=no-mips16
 
-PKG_BUILD_VERSION:=alpha-a08aa10
+PKG_BUILD_VERSION:=alpha-59a2b24
 PKG_BUILD_TIME:=$(shell date -u -Iseconds)
 
 GO_PKG:=github.com/metacubex/mihomo
diff --git a/natflow/Makefile b/natflow/Makefile
index 5d3681bb9..2c7f73419 100644
--- a/natflow/Makefile
+++ b/natflow/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=natflow
-PKG_VERSION:=20240922
+PKG_VERSION:=20240924
 
 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=0e175a9c54e2811793776c14cd8f96233c23d815407b20d790208c21b1aac42d
+PKG_HASH:=e46a3e2c31611c9902932eab25904502cf59a6394fb2e796c849f28aeccb9641
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>
diff --git a/natflow/files/natflow-boot.init b/natflow/files/natflow-boot.init
index fa0be8c9a..7421c87b0 100644
--- a/natflow/files/natflow-boot.init
+++ b/natflow/files/natflow-boot.init
@@ -25,8 +25,9 @@ start() {
 	enabled=$(uci get natflow.main.enabled 2>/dev/null || echo 0)
 	debug=$(uci get natflow.main.debug 2>/dev/null || echo 3)
 	delay_pkts=$(uci get natflow.main.delay_pkts 2>/dev/null || echo 0)
-	skip_qos_to_slow_path=$(uci get natflow.main.skip_qos_to_slow_path 2>/dev/null || echo 0)
-	ifname_filter=$(uci get natflow.main.ifname_filter 2>/dev/null)
+	go_slowpath_if_no_qos=$(uci get natflow.main.go_slowpath_if_no_qos 2>/dev/null || echo 0)
+	ifname_group=$(uci get natflow.main.ifname_group 2>/dev/null)
+	ifname_group_type=$(uci get natflow.main.ifname_group_type 2>/dev/null || echo 0)
 
 	echo "debug=$debug" >/dev/natflow_ctl
 	echo "disabled=$((!enabled))" >/dev/natflow_ctl
@@ -43,10 +44,11 @@ start() {
 	fi
 
 	echo "delay_pkts=$delay_pkts" >/dev/natflow_ctl
-	echo "skip_qos_to_slow_path=$skip_qos_to_slow_path" >/dev/natflow_ctl
-	echo ifname_clear >/dev/natflow_ctl
-	for ifn in ${ifname_filter}; do
-		echo "ifname_add=$ifn" >/dev/natflow_ctl
+	echo "go_slowpath_if_no_qos=$go_slowpath_if_no_qos" >/dev/natflow_ctl
+	echo "ifname_group_type=$ifname_group_type" >/dev/natflow_ctl
+	echo "ifname_group_clear=$ifname_group_clear" >/dev/natflow_ctl
+	for ifn in ${ifname_group}; do
+		echo "ifname_group_add=$ifn" >/dev/natflow_ctl
 	done
 }
 
diff --git a/natflow/files/natflow.config b/natflow/files/natflow.config
index d258b1348..57aaffa99 100644
--- a/natflow/files/natflow.config
+++ b/natflow/files/natflow.config
@@ -4,8 +4,9 @@ config natflow 'main'
 	option enabled '1'
 	option debug '3'
 	option delay_pkts '0'
-	option skip_qos_to_slow_path '0'
-	list ifname_filter ''
+	option go_slowpath_if_no_qos '0'
+	option ifname_group_type '0' #0:fastnat_for_all 1:fastnat_ifname_group_only 2:fastnat_ifname_group_bypass
+	list ifname_group ''
 	option tc_classid_mode '1'
 
 config globals 'globals'