From 737d460c0c2ba6abe8c66afeb3fca75fa2210e82 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 23:36:05 +0800
Subject: [PATCH] update 2023-06-13 23:36:05

---
 natflow/files/natflow-simple-qos.init | 15 +++++++++++++++
 v2ray-geodata/Makefile                |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/natflow/files/natflow-simple-qos.init b/natflow/files/natflow-simple-qos.init
index 03568e950..28b8084b1 100644
--- a/natflow/files/natflow-simple-qos.init
+++ b/natflow/files/natflow-simple-qos.init
@@ -36,9 +36,22 @@ get_rate_data()
 	echo -n $num # assume num bps
 }
 
+dispatch_userinfo_event_fifo()
+{
+	pgrep -f "sh -c echo .*>/tmp/userinfo_event_fifo" >/dev/null && {
+		#event fifo is busy
+		return
+	}
+	sh -c "echo $1>/tmp/userinfo_event_fifo" &
+	return 0
+}
+
 qos_simple_watch()
 {
+	dispatch_userinfo_event_fifo ""
+
 	cat /dev/userinfo_event_ctl 2>/dev/null | while read line; do
+		dispatch_userinfo_event_fifo "$line"
 		ip=${line//,*}
 		idx=0
 		while uci get natflow.@qos_simple[$idx] &>/dev/null; do
@@ -81,11 +94,13 @@ start() {
 		done
 	done
 
+	test -e /tmp/userinfo_event_fifo || mkfifo /tmp/userinfo_event_fifo
 	qos_simple_watch &
 }
 
 stop() {
 	kill -TERM $(pgrep -f "cat /dev/userinfo_event_ctl") &>/dev/null
+	kill -TERM $(pgrep -f "sh -c echo .*>/tmp/userinfo_event_fifo") &>/dev/null
 	cat /dev/userinfo_ctl | while read line; do
 		ip=${line//,*}
 		echo set-token-ctrl $ip 0 0 >/dev/userinfo_ctl
diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
index 1670bfba6..9f45fac36 100644
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=a3c407051f1e2bbeef98c82372cec8de3ee6d44f645eeb07699bfcaec4ea3f1b
 endef
 
-GEOSITE_VER:=20230612114846
+GEOSITE_VER:=20230613031206
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
   URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
   URL_FILE:=dlc.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=e629fb02cca4e1a9d104c991b329b6404f06d5c00fdc26e8df3c57a9acfb156c
+  HASH:=1cd19fcedf30ff22df215c40e7797a36366e63e1e5cb9572c9b16789af1dde64
 endef
 
 define Package/v2ray-geodata/template