Merge branch 'master' of github.com:CC11001100/ecapture

.github/workflows/codeql-analysis.yml

@@ -49,19 +49,15 @@ jobs:
       - name: Install Compilers
         run: |
           sudo apt-get update
-          kernel_ver=`uname -r | cut -d'-' -f 1`
-          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-12 clang-12 linux-tools-common linux-tools-generic flex bison gcc-aarch64-linux-gnu libssl-dev linux-source-${kernel_ver}
-          for tool in "clang" "llc" "llvm-strip"
-          do
-            sudo rm -f /usr/bin/$tool
-            sudo ln -s /usr/bin/$tool-12 /usr/bin/$tool
-          done
+          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm clang linux-tools-common linux-tools-generic flex bison gcc-aarch64-linux-gnu libssl-dev linux-source
           cd /usr/src
-          sudo tar -xf linux-source-${kernel_ver}.tar.bz2
-          cd /usr/src/linux-source-${kernel_ver}
+          source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
+          source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')  
+          sudo tar -xf $source_file
+          cd $source_dir
           test -f .config || sudo make oldconfig
           sudo make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- prepare V=0
-          ls -al /usr/src/linux-source-${kernel_ver}
+          ls -al /usr/src/$source_dir
         shell: bash
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/go-c-cpp.yml

@@ -59,19 +59,20 @@ jobs:
       - name: Install Compilers
         run: |
           sudo apt-get update
-          kernel_ver=`uname -r | cut -d'-' -f 1`
-          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-14 clang-14 flex bison linux-tools-common linux-tools-generic gcc gcc-aarch64-linux-gnu libssl-dev linux-source-${kernel_ver}
+          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-14 clang-14 flex bison linux-tools-common linux-tools-generic gcc gcc-aarch64-linux-gnu libssl-dev linux-source
           for tool in "clang" "llc" "llvm-strip"
           do
             sudo rm -f /usr/bin/$tool
             sudo ln -s /usr/bin/$tool-14 /usr/bin/$tool
           done
           cd /usr/src
-          sudo tar -xf linux-source-${kernel_ver}.tar.bz2
-          cd /usr/src/linux-source-${kernel_ver}
+          source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
+          source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')  
+          sudo tar -xf $source_file
+          cd $source_dir
           test -f .config || sudo make oldconfig
           sudo make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- prepare V=0
-          ls -al /usr/src/linux-source-${kernel_ver}
+          ls -al /usr/src/$source_dir
         shell: bash
       - uses: actions/checkout@v4
         with:
@@ -170,18 +171,19 @@ jobs:
           install: |
             uname -a
             apt-get update
-            kernel_ver=`uname -r | cut -d'-' -f 1`
-            apt-get install --yes wget git build-essential pkgconf libelf-dev llvm-12 clang-12 linux-tools-generic linux-tools-common flex bison file gcc-x86-64-linux-gnu libssl-dev bc linux-source-${kernel_ver}
+            apt-get install --yes wget git build-essential pkgconf libelf-dev llvm-12 clang-12 linux-tools-generic linux-tools-common flex bison file gcc-x86-64-linux-gnu libssl-dev bc linux-source
             wget https://go.dev/dl/go1.21.0.linux-arm64.tar.gz
             rm -rf /usr/local/go
             tar -C /usr/local -xzf go1.21.0.linux-arm64.tar.gz
             cd /usr/src
-            tar -xf linux-source-${kernel_ver}.tar.bz2
-            cd /usr/src/linux-source-${kernel_ver}
+            source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
+            source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')
+            tar -xf $source_file
+            cd $source_dir
             test -f .config || make oldconfig > /dev/null
             make ARCH=x86 CROSS_COMPILE=x86_64-linux-gnu- prepare V=0 > /dev/null
             make prepare V=0 > /dev/null
-            ls -al /usr/src/linux-source-${kernel_ver}
+            ls -al /usr/src/$source_dir
           # Produce a binary artifact and place it in the mounted volume
           run: |
             uname -a
@@ -199,18 +201,20 @@ jobs:
             cat /proc/1/cgroup
             echo "cat /proc/1/sched:"
             cat /proc/1/sched
+            cd /usr/src
+            source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
+            source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')
             git config --global --add safe.directory /source_code
             cd /source_code
-            kernel_ver=`uname -r | cut -d'-' -f 1`
             echo "-------------------start: Build CO-RE Linux (include non-CO-RE)-------------------"
-            KERN_HEADERS=/usr/src/linux-source-${kernel_ver} make env
+            KERN_HEADERS=/usr/src/$source_dir make env
             make clean
-            KERN_HEADERS=/usr/src/linux-source-${kernel_ver} make
+            KERN_HEADERS=/usr/src/$source_dir make
             bin/ecapture -v
             echo "-------------------start: Build non-CO-RE (Cross-Compilation) Linux -------------------"
             make clean
-            KERN_HEADERS=/usr/src/linux-source-${kernel_ver} CROSS_ARCH=amd64 make env
-            KERN_HEADERS=/usr/src/linux-source-${kernel_ver} CROSS_ARCH=amd64 make nocore -j8
+            KERN_HEADERS=/usr/src/$source_dir CROSS_ARCH=amd64 make env
+            KERN_HEADERS=/usr/src/$source_dir CROSS_ARCH=amd64 make nocore -j8
             file bin/ecapture
       - name: Show the artifact
         # Items placed in /artifacts in the container will be in

.github/workflows/release.yml

@@ -16,19 +16,20 @@ jobs:
       - name: Install Compilers
         run: |
           sudo apt-get update
-          kernel_ver=`uname -r | cut -d'-' -f 1`
-          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-14 clang-14 linux-tools-common linux-tools-generic gcc gcc-aarch64-linux-gnu linux-source-${kernel_ver}
+          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-14 clang-14 linux-tools-common linux-tools-generic gcc gcc-aarch64-linux-gnu linux-source
           for tool in "clang" "llc" "llvm-strip"
           do
             sudo rm -f /usr/bin/$tool
             sudo ln -s /usr/bin/$tool-14 /usr/bin/$tool
           done
           cd /usr/src
-          sudo tar -xf linux-source-${kernel_ver}.tar.bz2
-          cd /usr/src/linux-source-${kernel_ver}
+          source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
+          source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')  
+          sudo tar -xf $source_file
+          cd $source_dir
           test -f .config || sudo make oldconfig
           sudo make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- prepare V=0
-          ls -al /usr/src/linux-source-${kernel_ver}
+          ls -al /usr/src/$source_dir
         shell: bash
       - uses: actions/checkout@v4
         with:

CHANGELOG.md

@@ -1,6 +1,40 @@
+# v0.8.8 (2024-10-09)
+
+## What's Changed
+
+**Full Changelog**: https://github.com/gojue/ecapture/compare/v0.8.7...v0.8.8
+<hr>
+
+# v0.8.7 (2024-10-07)
+## What's Changed
+
+* feat: remove tcp packet limitation by @yuweizzz in https://github.com/gojue/ecapture/pull/619
+* kern: support openssl 3.3.2/3.2.3/3.1.7/3.0.15 by @cfc4n in https://github.com/gojue/ecapture/pull/624
+* workflows: update linux source tgz file version. by @cfc4n in https://github.com/gojue/ecapture/pull/644
+* fix the issue with retrieving the return value of the Read function in the Golang TLS module. by @cfc4n
+  in https://github.com/gojue/ecapture/pull/646
+
+**Full Changelog**: https://github.com/gojue/ecapture/compare/v0.8.6...v0.8.7
+<hr>
+
 # v0.8.6 (2024-09-06)
 ## What's Changed
 
+* GitHub action codecov by @cfc4n in https://github.com/gojue/ecapture/pull/594
+* fix: fix undeclared identifier error when make in debug mode by @yuweizzz
+  in https://github.com/gojue/ecapture/pull/593
+* user: adjusted the timing of the display of the kernel version is too low by @cfc4n
+  in https://github.com/gojue/ecapture/pull/607
+* kern: support uid/pid filter in ebpf TC hook. by @cfc4n in https://github.com/gojue/ecapture/pull/606
+* fix: fallback to default version with warn by @xxxxxliil in https://github.com/gojue/ecapture/pull/613
+* chore: Use `-tags 'netgo'` in bulding process to avoid SIGSEGV because of the different version of glibc in dfferent
+  Linux distros by @Zheaoli in https://github.com/gojue/ecapture/pull/616
+
+## New Contributors
+
+* @xxxxxliil made their first contribution in https://github.com/gojue/ecapture/pull/613
+* @Zheaoli made their first contribution in https://github.com/gojue/ecapture/pull/616
+
 **Full Changelog**: https://github.com/gojue/ecapture/compare/v0.8.5...v0.8.6
 <hr>
 

COMPILATION.md

@@ -85,11 +85,12 @@ To cross-compile the eCapture tool, you need to install the kernel header files
 install the `linux-source` package.
 
 ```shell
-kernel_ver=`uname -r | cut -d'-' -f 1`
-sudo apt-get install -y linux-source-$kernel_ver
+sudo apt-get install -y linux-source
 cd /usr/src
-sudo tar -xf linux-source-${kernel_ver}.tar.bz2
-cd /usr/src/linux-source-${kernel_ver}
+source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
+source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')  
+sudo tar -xf $source_file
+cd $source_dir
 test -f .config || yes "" | sudo make oldconfig
 ```
 

COMPILATION_CN.md

@@ -102,8 +102,10 @@ bin/ecapture
 kernel_ver=`uname -r | cut -d'-' -f 1`
 sudo apt-get install -y linux-source-$kernel_ver
 cd /usr/src
-sudo tar -xf linux-source-${kernel_ver}.tar.bz2
-cd /usr/src/linux-source-${kernel_ver}
+source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
+source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')  
+sudo tar -xf $source_file
+cd $source_dir
 test -f .config || yes "" | sudo make oldconfig
 ```
 

Makefile

@@ -50,6 +50,7 @@ env:
 	@echo "LAST_GIT_TAG             $(LAST_GIT_TAG)"
 	@echo "BPF_NOCORE_TAG           $(BPF_NOCORE_TAG)"
 	@echo "KERN_RELEASE             $(KERN_RELEASE)"
+	@echo "LINUX_SOURCE_PATH        $(LINUX_SOURCE_PATH)"
 	@echo "KERN_BUILD_PATH          $(KERN_BUILD_PATH)"
 	@echo "KERN_SRC_PATH            $(KERN_SRC_PATH)"
 	@echo "TARGET_ARCH              $(TARGET_ARCH)"
@@ -96,8 +97,11 @@ help:
 
 .PHONY: prepare
 prepare:
-	$(CMD_CD) $(LINUX_SOURCE_PATH)
-	$(KERNEL_HEADER_GEN) || exit 1
+	if [ -d "$(LINUX_SOURCE_PATH)" ]; then \
+		$(CMD_CD) $(LINUX_SOURCE_PATH) && $(KERNEL_HEADER_GEN) || { echo "Kernel header generation failed"; exit 1; } \
+	elif [ -n "$(CROSS_ARCH)" ]; then \
+		$(CMD_ECHO) "linux source not found with path: $(LINUX_SOURCE_PATH)" || exit 1; \
+    fi
 
 .PHONY: clean assets build ebpf
 
@@ -144,22 +148,23 @@ ebpf_noncore: prepare $(KERN_OBJECTS_NOCORE)
 .PHONY: $(KERN_OBJECTS_NOCORE)
 $(KERN_OBJECTS_NOCORE): %.nocore: %.c \
 	| .checkver_$(CMD_CLANG) \
-	.checkver_$(CMD_GO)
+	.checkver_$(CMD_GO) \
+	prepare
 	$(CMD_CLANG) \
 			$(EXTRA_CFLAGS_NOCORE) \
-    		$(BPFHEADER) \
+			$(BPFHEADER) \
 			-I $(KERN_SRC_PATH)/arch/$(LINUX_ARCH)/include \
 			-I $(KERN_BUILD_PATH)/arch/$(LINUX_ARCH)/include/generated \
 			-I $(KERN_SRC_PATH)/include \
 			-I $(KERN_SRC_PATH)/arch/$(LINUX_ARCH)/include/uapi \
 			-I $(KERN_BUILD_PATH)/arch/$(LINUX_ARCH)/include/generated/uapi \
 			-I $(KERN_SRC_PATH)/include/uapi \
 			-I $(KERN_BUILD_PATH)/include/generated/uapi \
-    		-c $< \
-    		-o - |$(CMD_LLC) \
-    		-march=bpf \
-    		-filetype=obj \
-    		-o $(subst kern/,user/bytecode/,$(subst .c,_noncore.o,$<))
+			-c $< \
+			-o - |$(CMD_LLC) \
+			-march=bpf \
+			-filetype=obj \
+			-o $(subst kern/,user/bytecode/,$(subst .c,_noncore.o,$<))
 	$(CMD_CLANG) \
 			$(EXTRA_CFLAGS_NOCORE) \
 			$(BPFHEADER) \
@@ -195,7 +200,7 @@ assets_noncore: \
 $(TARGET_LIBPCAP):
 	test -f ./lib/libpcap/configure || git submodule update --init
 	cd lib/libpcap && \
-		CC=$(CMD_CC_PREFIX)$(CMD_CC) AR=$(CMD_AR_PREFIX)$(CMD_AR) CFLAGS="-O2 -g -gdwarf-4 -static" ./configure --disable-rdma --disable-shared --disable-usb \
+		CC=$(CMD_CC_PREFIX)$(CMD_CC) AR=$(CMD_AR_PREFIX)$(CMD_AR) CFLAGS="-O2 -g -gdwarf-4 -static -Wno-unused-result" ./configure --disable-rdma --disable-shared --disable-usb \
 			--disable-netmap --disable-bluetooth --disable-dbus --without-libnl \
 			--without-dpdk --without-dag --without-septel --without-snf \
 			--without-gcc --with-pcap=linux \

builder/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:22.04 as ecapture_builder
 
 # Install Compilers
 RUN apt-get update &&\
-  apt-get install --yes build-essential pkgconf libelf-dev llvm-14 clang-14 linux-tools-common linux-tools-$(uname -r) make gcc flex bison file wget &&\
+  apt-get install --yes git build-essential pkgconf libelf-dev llvm-14 clang-14 linux-tools-common linux-headers-$(uname -r) make gcc flex bison file wget linux-source &&\
   # the for-shell built-in instruction does not count as a command 
   # and the shell used to execute the script is sh by default and not bash.
   rm -f /usr/bin/clang && ln -s /usr/bin/clang-14 /usr/bin/clang &&\
@@ -29,7 +29,7 @@ ARG VERSION
 
 RUN cd /build/ecapture &&\
   make clean &&\
-  make -j $(nproc) all SNAPSHOT_VERSION=${VERSION}_docker
+  make all SNAPSHOT_VERSION=${VERSION}_docker
 
 # ecapture release image
 FROM alpine:latest as ecapture

builder/init_env.sh

@@ -9,37 +9,48 @@ if [ $? -ne 0 ]; then
   exit
 fi
 
-CLANG_NUM=12
+CLANG_NUM=-12
 # shellcheck disable=SC2209
 MAKE_ECAPTURE=make
 if [ ${release_num} == "20.04" ]; then
-  CLANG_NUM=9
+  CLANG_NUM=-9
   MAKE_ECAPTURE="make nocore"
   elif [ ${release_num} == "20.10" ]; then
-  CLANG_NUM=10
+  CLANG_NUM=-10
   MAKE_ECAPTURE="make nocore"
   elif [ ${release_num} == "21.04" ]; then
-  CLANG_NUM=11
+  CLANG_NUM=-11
   elif [ ${release_num} == "21.10" ]; then
-  CLANG_NUM=12
+  CLANG_NUM=-12
   elif [ ${release_num} == "22.04" ]; then
-  CLANG_NUM=12
+  CLANG_NUM=-12
   elif [ ${release_num} == "22.10" ]; then
-  CLANG_NUM=12
+  CLANG_NUM=-12
   elif [ ${release_num} == "23.04" ];then
-  CLANG_NUM=15
+  CLANG_NUM=-15
+  elif [ ${release_num} == "23.10" ];then
+    CLANG_NUM=-15
+  elif [ ${release_num} == "24.04" ];then
+  CLANG_NUM=-18
   else
-    echo "unsupported release version ${release_num}" && exit
+    echo "used default CLANG Version"
+    CLANG_NUM=
 fi
 
 echo "CLANG_NUM=${CLANG_NUM}"
 
 UNAME_M=`uname -m`
 ARCH="amd64"
+CROSS_ARCH_PATH="arm64"
+CROSS_COMPILE=aarch64-linux-gnu-
 if [[ ${UNAME_M} =~ "x86_64" ]];then
   ARCH="amd64"
+  CROSS_ARCH_PATH="arm64"
+  CROSS_COMPILE=aarch64-linux-gnu-
   elif [[ ${UNAME_M} =~ "aarch64" ]]; then
     ARCH="arm64"
+    CROSS_ARCH_PATH="x86"
+    CROSS_COMPILE=x86_64-linux-gnu-
   else
     echo "unsupported arch ${UNAME_M}";
 fi
@@ -52,22 +63,23 @@ cd ~
 
 uname -a
 sudo apt-get update
-kernel_ver=`uname -r | cut -d'-' -f 1`
 # 环境安装
-sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-${CLANG_NUM} clang-${CLANG_NUM} linux-tools-common linux-tools-generic gcc-aarch64-linux-gnu libssl-dev flex bison linux-source-${kernel_ver}
+sudo apt-get install --yes build-essential pkgconf libelf-dev llvm${CLANG_NUM} clang${CLANG_NUM} linux-tools-common linux-tools-generic gcc-aarch64-linux-gnu libssl-dev flex bison linux-source
 for tool in "clang" "llc" "llvm-strip"
 do
   sudo rm -f /usr/bin/$tool
-  sudo ln -s /usr/bin/$tool-${CLANG_NUM} /usr/bin/$tool
+  sudo ln -s /usr/bin/$tool${CLANG_NUM} /usr/bin/$tool
 done
 
 cd /usr/src
-sudo tar -xf linux-source-${kernel_ver}.tar.bz2
-cd /usr/src/linux-source-${kernel_ver}
+source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
+source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')
+sudo tar -xf $source_file
+cd $source_dir
 test -f .config || yes "" | sudo make oldconfig
-yes "" | sudo make ARCH=${ARCH} CROSS_COMPILE=aarch64-linux-gnu- prepare V=0 > /dev/null
+yes "" | sudo make ARCH=${CROSS_ARCH_PATH} CROSS_COMPILE=${CROSS_COMPILE} prepare V=0 > /dev/null
 yes "" | sudo make prepare V=0 > /dev/null
-ls -al /usr/src/linux-source-${kernel_ver}
+ls -al $source_dir
 
 clang --version
 cd ~