Fix dae trace

Use r8152 oot drivers

Signed-off-by: Nicholas Sun <nicholas-sun@outlook.com>

Author: nicholas-opensource

PATCH/dae/Makefile

@@ -0,0 +1,128 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2023 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dae
+PKG_VERSION:=0.6.0rc2
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/daeuniverse/dae.git
+PKG_SOURCE_VERSION:=b5ebd4f8cb82c5a0b44a49b53f3e9df4f01419c8
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=AGPL-3.0-only
+PKG_LICENSE_FILE:=LICENSE
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+PKG_BUILD_DEPENDS:=golang/host bpf-headers
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
+
+GO_PKG:=github.com/daeuniverse/dae
+GO_PKG_LDFLAGS_X:= \
+	$(GO_PKG)/cmd.Version=$(PKG_VERSION) \
+	$(GO_PKG)/common/consts.MaxMatchSetLen_=64
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/bpf.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
+
+define Package/dae/Default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  URL:=https://github.com/daeuniverse/dae
+endef
+
+define Package/dae
+  $(call Package/dae/Default)
+  TITLE:=A lightweight and high-performance transparent proxy solution
+  # You need enable KERNEL_DEBUG_INFO_BTF and KERNEL_BPF_EVENTS
+  DEPENDS:=$(GO_ARCH_DEPENDS) $(BPF_DEPENDS)  \
+    +ca-bundle +kmod-sched-core +kmod-sched-bpf +kmod-xdp-sockets-diag +kmod-veth
+endef
+
+define Package/dae-geoip
+  $(call Package/dae/Default)
+  TITLE:=geoip for dae
+  DEPENDS:=+v2ray-geoip
+  PKGARCH:=all
+endef
+
+define Package/dae-geosite
+  $(call Package/dae/Default)
+  TITLE:=geosite for dae
+  DEPENDS:=+v2ray-geosite
+  PKGARCH:=all
+endef
+
+define Package/dae/description
+  dae, means goose, is a lightweight and high-performance transparent
+  proxy solution.
+
+  In order to improve the traffic diversion performance as much as possible,
+  dae runs the transparent proxy and traffic diversion suite in the linux
+  kernel by eBPF. Therefore, we have the opportunity to make the direct
+  traffic bypass the forwarding by proxy application and achieve true direct
+  traffic through. Under such a magic trick, there is almost no performance
+  loss and additional resource consumption for direct traffic.
+endef
+
+define Package/dae/conffiles
+/etc/dae/config.dae
+/etc/config/dae
+endef
+
+DAE_CFLAGS:= \
+	-O2 -Wall -Werror \
+	-DMAX_MATCH_SET_LEN=64 \
+	-I$(BPF_HEADERS_DIR)/tools/lib \
+	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/asm/mach-generic
+
+define Build/Compile
+	( \
+		export $(GO_GENERAL_BUILD_CONFIG_VARS) \
+		$(GO_PKG_BUILD_CONFIG_VARS) \
+		$(GO_PKG_BUILD_VARS) \
+		BPF_CLANG="$(CLANG)" \
+		BPF_STRIP_FLAG="-strip=$(LLVM_STRIP)" \
+		BPF_CFLAGS="$(DAE_CFLAGS)" \
+		BPF_TARGET="bpfel,bpfeb" \
+		BPF_TRACE_TARGET="$(GO_ARCH)" ; \
+		go generate $(PKG_BUILD_DIR)/control/control.go ; \
+		go generate $(PKG_BUILD_DIR)/trace/trace.go ; \
+		$(call GoPackage/Build/Compile) ; \
+	)
+endef
+
+define Package/dae/install
+	$(call GoPackage/Package/Install/Bin,$(1))
+
+	$(INSTALL_DIR) $(1)/etc/dae/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/example.dae $(1)/etc/dae/
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(CURDIR)/files/dae.config $(1)/etc/config/dae
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(CURDIR)/files/dae.init $(1)/etc/init.d/dae
+endef
+
+define Package/dae-geoip/install
+	$(INSTALL_DIR) $(1)/usr/share/dae
+	$(LN) ../v2ray/geoip.dat $(1)/usr/share/dae/geoip.dat
+endef
+
+define Package/dae-geosite/install
+	$(INSTALL_DIR) $(1)/usr/share/dae
+	$(LN) ../v2ray/geosite.dat $(1)/usr/share/dae/geosite.dat
+endef
+
+$(eval $(call GoBinPackage,dae))
+$(eval $(call BuildPackage,dae))
+$(eval $(call BuildPackage,dae-geoip))
+$(eval $(call BuildPackage,dae-geosite))

PATCH/dae/files/dae.config

@@ -0,0 +1,7 @@
+
+config dae 'config'
+	option enabled '0'
+	option config_file '/etc/dae/config.dae'
+	option log_maxbackups '1'
+	option log_maxsize '1'
+

PATCH/dae/files/dae.init

@@ -0,0 +1,56 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2023 Tianling Shen <cnsztl@immortalwrt.org>
+
+USE_PROCD=1
+START=99
+
+extra_command "hot_reload" "Hot-reload service"
+
+CONF="dae"
+PROG="/usr/bin/dae"
+LOG_DIR="/var/log/dae"
+
+start_service() {
+	config_load "$CONF"
+
+	local enabled
+	config_get_bool enabled "config" "enabled" "0"
+	[ "$enabled" -eq "1" ] || return 1
+
+	local config_file
+	config_get config_file "config" "config_file" "/etc/dae/config.dae"
+
+	"$PROG" validate -c "$config_file" || return 1
+
+	local log_maxbackups log_maxsize
+	config_get log_maxbackups "config" "log_maxbackups" "1"
+	config_get log_maxsize "config" "log_maxsize" "1"
+
+	procd_open_instance "$CONF"
+	procd_set_param command "$PROG" run
+	procd_append_param command --config "$config_file"
+	procd_append_param command --disable-timestamp
+	procd_append_param command --logfile "$LOG_DIR/dae.log"
+	procd_append_param command --logfile-maxbackups "$log_maxbackups"
+	procd_append_param command --logfile-maxsize "$log_maxsize"
+
+	procd_set_param limits core="unlimited"
+	procd_set_param limits nofile="1000000 1000000"
+	procd_set_param respawn
+	# procd_set_param stdout 1
+	procd_set_param stderr 1
+
+	procd_close_instance
+}
+
+stop_service() {
+	rm -rf "$LOG_DIR"
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$CONF"
+}
+
+hot_reload() {
+	"$PROG" reload "$(cat /var/run/dae.pid)"
+}

README.md

@@ -23,24 +23,24 @@ regarding the accuracy, adequacy, validity, reliability, availability, or comple
 ---
 ### Key Infomations
 
-Login IP：192.168.1.1 
+Login IP：192.168.1.1  
 
-Password：None
+Password：None  
 
 ### Version Informations
 
-OpenWrt official v23.05.2
+OpenWrt official v23.05.3  
 
 ---
 ### Feature
 
-1.Based on official OpenWrt
+1.Based on official OpenWrt  
 
-2.Only contain the most basic software for the stability
+2.Only contain the most basic software for the stability  
 
-3.Fullcone NAT supported
+3.Fullcone NAT supported  
 
-4.Opkg vermagic matched with OpenWrt manifest ( You can install the software as if you have AppStore~ )
+4.Opkg vermagic matched with OpenWrt manifest ( You can install the software as if you have AppStore~ )  
 
 5.Add package [dae](https://github.com/daeuniverse/dae), a high performance eBPF transparent proxy client  
 
@@ -50,11 +50,11 @@ OpenWrt official v23.05.2
 
 8.Update to firewall4, firewall3 no longer supported ( Huge improvements in performance )  
 
-9.Add support for phone USB hotspot sharing, both for Android and iPhone
+9.Add support for phone USB hotspot sharing, both for Android and iPhone  
 
-10.Disable IPv6 by default
+10.Disable IPv6 by default  
 
-  * If you do need IPv6
+  * If you do need IPv6  
 
 ```
 uci set dhcp.lan.ra='hybrid'
@@ -68,7 +68,7 @@ uci commit dhcp
   * PS: HYBRID mode is never a good choice, please learn about [IPv6](https://www.cisco.com/en/US/docs/switches/lan/catalyst3850/software/release/3se/consolidated_guide/b_consolidated_3850_3se_cg_chapter_0101011.html). Also odhcpd on OpenWrt has serious bugs!  
   * Bug fixed: 
     * Add `dhcp.lan.max_preferred_lifetime` and `dhcp.lan.max_valid_lifetime` with LuCI options  
-    * Add scripts to fix `lan` IPv6 misbehaving when `wan` is getting IPv6-PD via PPPoE
+    * Add scripts to fix `lan` IPv6 misbehaving when `wan` is getting IPv6-PD via PPPoE  
 
 #### X86_64 Feature
 
@@ -83,23 +83,23 @@ Realtek: r8125, r8169, r8152
 
 #### R2S Feature
 
-1.Fix DDR4 333MHz problem
+1.Fix DDR4 333MHz problem  
 
-2.Modify DTSI to support overclocked unstable devices as much as possible
+2.Modify DTSI to support overclocked unstable devices as much as possible  
 
-3.Remove frequencies below 800MHz (same voltage) for faster response
+3.Remove frequencies below 800MHz (same voltage) for faster response  
 
-4.Support TF card with a minimum size of 512MB
+4.Support TF card with a minimum size of 512MB  
 
 ![](/Screenshots/main.jpeg)
 
 #### R4S Feature
 
-1.Overclock to 2208MHz/1800MHz (big.LITTLE)
+1.Overclock to 2208MHz/1800MHz (big.LITTLE)  
 
-2.Remove thermal throttle limit (Default at 70°C)
+2.Remove thermal throttle limit (Default at 70°C)  
 
-3.Support TF card in 1.8V signalling, fix UHS card cannot boot in 3.3V mode
+3.Support TF card in 1.8V signalling, fix UHS card cannot boot in 3.3V mode  
 
 ---
 ## Thanks to everyone in ImmortalWrt and OpenWrt

SCRIPTS/02_prepare_package.sh

@@ -71,6 +71,7 @@ cp -rf ../immortalwrt_23/package/boot/uboot-rockchip ./package/boot/uboot-rockch
 rm -rf ./package/boot/arm-trusted-firmware-rockchip
 cp -rf ../immortalwrt_23/package/boot/arm-trusted-firmware-rockchip ./package/boot/arm-trusted-firmware-rockchip
 sed -i '/REQUIRE_IMAGE_METADATA/d' target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh
+sed -i '/^define Device\/friendlyarm_nanopi-.*$/,/^endef/ s/kmod-usb-net-rtl8152/kmod-usb-net-rtl8152-vendor/' target/linux/rockchip/image/armv8.mk
 wget -qO - https://github.com/openwrt/openwrt/commit/c21a3570.patch | patch -p1
 sed -i '/I915/d' target/linux/x86/64/config-5.15
 # Disable mitigations
@@ -100,7 +101,8 @@ cp -rf ../immortalwrt_23/package/utils/mhz ./package/utils/mhz
 cp -rf ../immortalwrt_luci/applications/luci-app-autoreboot ./feeds/luci/applications/luci-app-autoreboot
 ln -sf ../../../feeds/luci/applications/luci-app-autoreboot ./package/feeds/luci/luci-app-autoreboot
 # Dae ready
-cp -rf ../immortalwrt_pkg/net/dae ./feeds/packages/net/dae
+#cp -rf ../immortalwrt_pkg/net/dae ./feeds/packages/net/dae
+cp -rf ../PATCH/dae ./feeds/packages/net/dae
 ln -sf ../../../feeds/packages/net/dae ./package/feeds/packages/dae
 wget -qO - https://github.com/immortalwrt/immortalwrt/commit/73e5679.patch | patch -p1
 wget https://github.com/immortalwrt/immortalwrt/raw/openwrt-23.05/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch -O target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch
@@ -112,18 +114,15 @@ cp -rf ../PATCH/cgroupfs-mount/900-mount-cgroup-v2-hierarchy-to-sys-fs-cgroup-cg
 cp -rf ../PATCH/cgroupfs-mount/901-fix-cgroupfs-umount.patch ./feeds/packages/utils/cgroupfs-mount/patches/
 cp -rf ../PATCH/script/updategeo.sh ./package/base-files/files/bin/updategeo
 # Dae update
-sed -i '/zip/d;/HASH/d;/RELEASE:=/d' feeds/packages/net/dae/Makefile
-sed -i "/VERSION:/ s/$/-$(date +'%Y%m%d')/" feeds/packages/net/dae/Makefile
-sed -i '10i\PKG_SOURCE_PROTO:=git' feeds/packages/net/dae/Makefile
-sed -i '11i\PKG_SOURCE_URL:=https://github.com/daeuniverse/dae.git' feeds/packages/net/dae/Makefile
-sed -i "12i\PKG_SOURCE_VERSION:=$(curl -s https://api.github.com/repos/daeuniverse/dae/commits | grep '"sha"' | head -1 | cut -d '"' -f 4)" feeds/packages/net/dae/Makefile
-sed -i '13i\PKG_MIRROR_HASH:=skip' feeds/packages/net/dae/Makefile
+sed -i "s,0.6.0rc2,$(curl -s "https://api.github.com/repos/daeuniverse/dae/releases" | grep -m 1 -oP '"tag_name": "\K(.*?)(?=")' | cut -d '"' -f 4)-$(date +'%Y%m%d'),g" feeds/packages/net/dae/Makefile
+sed -i "s,b5ebd4f8cb82c5a0b44a49b53f3e9df4f01419c8,$(curl -s https://api.github.com/repos/daeuniverse/dae/commits | grep '"sha"' | head -1 | cut -d '"' -f 4),g" feeds/packages/net/dae/Makefile
 # Golang
 rm -rf ./feeds/packages/lang/golang
 cp -rf ../openwrt_pkg_ma/lang/golang ./feeds/packages/lang/golang
 # NIC drivers update
 git clone https://github.com/sbwml/package_kernel_r8125 package/new/r8125
-cp -rf ../immortalwrt/package/kernel/r8152 ./package/new/r8152
+#cp -rf ../immortalwrt/package/kernel/r8152 ./package/new/r8152
+git clone https://github.com/sbwml/package_kernel_r8152 package/new/r8152
 git clone -b master --depth 1 https://github.com/BROBIRD/openwrt-r8168.git package/new/r8168
 patch -p1 <../PATCH/r8168/r8168-fix_LAN_led-for_r4s-from_TL.patch
 cp -rf ../lede/target/linux/x86/patches-5.15/996-intel-igc-i225-i226-disable-eee.patch ./target/linux/x86/patches-5.15/996-intel-igc-i225-i226-disable-eee.patch

SCRIPTS/switch

@@ -8,5 +8,5 @@
 #
 # Change Lines
 #
-# 24 Mar
+# 18 Apr