Merge branch 'test' into develop

.github/workflows/main.yml

@@ -2,13 +2,13 @@ name: openmptcprouter
 on: [push]
 
 env:
-  REPO_URL: 'https://github.com/suyuan168/3grouter'
+  REPO_URL: 'https://github.com/ysurac/openmptcprouter'
 
 jobs:
   build:
     strategy:
       matrix:
-        OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx, r5s, l1000, zbt4019]
+        OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx, r5s, qnap-301w]
         OMR_KERNEL: [5.4, 5.15, 6.1]
     runs-on: ubuntu-latest
     continue-on-error: true
@@ -39,7 +39,7 @@ jobs:
     - name: Clone source code
       working-directory: ../../
       env: 
-        REPO_URL: https://github.com/suyuan168/3grouter
+        REPO_URL: https://github.com/ysurac/openmptcprouter
         SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
         GITHUB_WORKSPACE: ${{ steps.branch_name.outputs.WORKSPACE }}
       run: |
@@ -58,7 +58,7 @@ jobs:
     - name: Build toolchain
       working-directory: ../../omr
       env:
-        OMR_FEED_URL: https://github.com/suyuan168/openmptcprouter-feeds
+        OMR_FEED_URL: https://github.com/ysurac/openmptcprouter-feeds
         SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
         OMR_TARGET: ${{ matrix.OMR_TARGET }}
         OMR_KERNEL: ${{ matrix.OMR_KERNEL }}
@@ -96,9 +96,9 @@ jobs:
           SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
       with:
         command: |
-          mkdir -p /www/wwwroot/55860.com/bak/down/release/${{env.SOURCE_TAG}}/${{matrix.OMR_TARGET}}
+          mkdir -p deploy/release/${{env.SOURCE_TAG}}/${{matrix.OMR_TARGET}}
         host: ${{ secrets.OMR_DEPLOY_HOST }}
-        user: root
+        user: deploy
         port: ${{ secrets.OMR_DEPLOY_PORT }}
         key: ${{ secrets.PRIVATE_KEY }}
         args: -tt
@@ -111,9 +111,9 @@ jobs:
           SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
       with:
         command: |
-          mkdir -p /www/wwwroot/55860.com/bak/down/${{env.SOURCE_BRANCH}}/${{matrix.OMR_KERNEL}}/${{matrix.OMR_TARGET}}
+          mkdir -p deploy/${{env.SOURCE_BRANCH}}/${{matrix.OMR_KERNEL}}/${{matrix.OMR_TARGET}}
         host: ${{ secrets.OMR_DEPLOY_HOST }}
-        user: root
+        user: deploy
         port: ${{ secrets.OMR_DEPLOY_PORT }}
         key: ${{ secrets.PRIVATE_KEY }}
         args: -tt
@@ -130,10 +130,10 @@ jobs:
       uses: ysurac/action-rsync@master
       env:
         ARGS: -av --delete-after
-        TARGET: /www/wwwroot/55860.com/bak/down/release/${{steps.branch_name.outputs.SOURCE_TAG}}/${{matrix.OMR_TARGET}}
+        TARGET: deploy/release/${{steps.branch_name.outputs.SOURCE_TAG}}/${{matrix.OMR_TARGET}}
         SOURCE: ./bin/
         KEY: ${{ secrets.PRIVATE_KEY }}
-        USER: root
+        USER: deploy
         HOST: ${{ secrets.OMR_DEPLOY_HOST }}
         PORT: ${{ secrets.OMR_DEPLOY_PORT }}
         SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
@@ -145,10 +145,10 @@ jobs:
       uses: ysurac/action-rsync@master
       env:
         ARGS: -av --delete-after
-        TARGET: /www/wwwroot/55860.com/bak/down/${{ steps.branch_name.outputs.SOURCE_BRANCH }}/${{matrix.OMR_KERNEL}}/${{matrix.OMR_TARGET}}
+        TARGET: deploy/${{ steps.branch_name.outputs.SOURCE_BRANCH }}/${{matrix.OMR_KERNEL}}/${{matrix.OMR_TARGET}}
         SOURCE: ./bin/
         KEY: ${{ secrets.PRIVATE_KEY }}
-        USER: root
+        USER: deploy
         HOST: ${{ secrets.OMR_DEPLOY_HOST }}
         PORT: ${{ secrets.OMR_DEPLOY_PORT }}
         SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}

luci-app-omr-bypass/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Interface to bypass domains
-LUCI_DEPENDS:=+dnsmasq-full +shadowsocks-libev-ss-rules +iptables-mod-ndpi +iptables-mod-extra +kmod-ipt-ndpi +iptables
+LUCI_DEPENDS:=+dnsmasq-full +shadowsocks-libev-ss-rules +(LINUX_5_4||LINUX_5_15||TARGET_x86_64):iptables-mod-ndpi +iptables-mod-extra +(LINUX_5_4||LINUX_5_15||TARGET_x86_64):kmod-ipt-ndpi +iptables
 
 PKG_LICENSE:=GPLv3
 

ndpi-netfilter2/Makefile

@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ndpi-netfilter2
 PKG_RELEASE:=4
-PKG_REV:=845399a0acb423e940c67a881a10f30f4c6a5fb7
+PKG_REV:=2fc0c86e58d56c8f9c5da3883a09732fc902e5e7
 PKG_VERSION:=4-$(PKG_REV)
 
 PKG_SOURCE_PROTO:=git
@@ -31,7 +31,7 @@ define Package/iptables-mod-ndpi
 	TITLE:=ndpi successor of OpenDPI
 	URL:=http://www.ntop.org/products/ndpi/
 #	DEPENDS:=+iptables +iptables-mod-conntrack-extra +kmod-ipt-ndpi +libpcap
-	DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap
+	DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64)
 	MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 endef
 
@@ -51,13 +51,15 @@ MAKE_FLAGS += \
     KERNEL_RELEASE="$(KERNEL_PATCHVER)" \
     CROSS_COMPILE="$(TARGET_CROSS)" \
     CC="$(TARGET_CC)" \
-    NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter
+#MAKE_FLAGS += \
+#    NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter
 
 define Build/Compile
 	(cd $(PKG_BUILD_DIR)/src/lib &&\
 	    gcc -g -O2 -fPIC -DPIC -DNDPI_LIB_COMPILATION -I../../src/include/ -I../../src/lib/third_party/include/ ndpi_network_list_compile.c -o ndpi_network_list_compile &&\
 	    ./ndpi_network_list_compile -o ndpi_network_list.c.inc ndpi_network_list_*.yaml)
-	$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)/ndpi-netfilter
+#	$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)/ndpi-netfilter
+	+$(KERNEL_MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)/ndpi-netfilter
 endef
 
 define Package/iptables-mod-ndpi/install
@@ -68,11 +70,16 @@ endef
 define KernelPackage/ipt-ndpi
 	SUBMENU:=Netfilter Extensions
 	TITLE:= nDPI net netfilter module
-	DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap
+	DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64)
 	KCONFIG:=CONFIG_NF_CONNTRACK_LABELS=y \
 	    CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
 	FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko
 	AUTOLOAD:=$(call AutoProbe,xt_ndpi)
+	KCONFIG:=\
+	    CONFIG_LIVEPATCH=y \
+	    CONFIG_NF_CONNTRACK=y \
+	    CONFIG_NF_CONNTRACK_LABELS=y \
+	    CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
 endef
 
 $(eval $(call BuildPackage,iptables-mod-ndpi))

openmptcprouter/files/etc/uci-defaults/1980-omr-firewall

@@ -5,6 +5,8 @@ uci -q batch <<-EOF >/dev/null
 	set firewall.@defaults[0].input='REJECT'
 	set firewall.@defaults[0].output='REJECT'
 	set firewall.@defaults[0].forward='REJECT'
+	set firewall.@defaults[0].flow_offloading='0'
+	set firewall.@defaults[0].flow_offloading_hw='0'
 EOF