Merge 9d1aebde66 into f49e6adedf

remove Dockerfile
try to fix linux 6.5 compile
2025-09-16 04:04:27 +08:00 · 2023-11-10 13:07:37 -08:00 · 2023-11-06 03:19:46 -05:00 · 2023-10-07 08:26:10 -04:00 · 2023-09-21 16:35:45 -04:00 · 2023-07-27 21:10:28 +08:00
5 changed files with 12 additions and 24 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/udp2raw*
--- a/13
+++ b/13
@@ -1,13 +0,0 @@
-FROM alpine:3.6 as builder
-
-WORKDIR /
-
-RUN apk add --no-cache git  build-base linux-headers && \
- git clone https://github.com/wangyu-/udp2raw-tunnel.git  && \
- cd udp2raw-tunnel && \
- make dynamic
-
-FROM alpine:3.6
-RUN apk add --no-cache libstdc++ iptables
-COPY --from=builder /udp2raw-tunnel/udp2raw_dynamic /bin/
-ENTRYPOINT [ "/bin/udp2raw_dynamic" ]
--- a/14
+++ b/14
@@ -1,13 +1,13 @@
 cc_cross=/home/wangyu/Desktop/arm-2014.05/bin/arm-none-linux-gnueabi-g++
 cc_local=g++
-cc_mips24kc_be=/toolchains/lede-sdk-17.01.2-ar71xx-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.16/bin/mips-openwrt-linux-musl-g++
-cc_mips24kc_le=/toolchains/lede-sdk-17.01.2-ramips-mt7621_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mipsel_24kc_gcc-5.4.0_musl-1.1.16/bin/mipsel-openwrt-linux-musl-g++
-cc_arm= /toolchains/lede-sdk-17.01.2-bcm53xx_gcc-5.4.0_musl-1.1.16_eabi.Linux-x86_64/staging_dir/toolchain-arm_cortex-a9_gcc-5.4.0_musl-1.1.16_eabi/bin/arm-openwrt-linux-c++
+cc_mips24kc_be=$(shell which g++ || /toolchains/lede-sdk-17.01.2-ar71xx-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.16/bin/mips-openwrt-linux-musl-g++)
+cc_mips24kc_le=$(shell which g++ || /toolchains/lede-sdk-17.01.2-ramips-mt7621_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mipsel_24kc_gcc-5.4.0_musl-1.1.16/bin/mipsel-openwrt-linux-musl-g++)
+cc_arm= $(shell which c++ || /toolchains/lede-sdk-17.01.2-bcm53xx_gcc-5.4.0_musl-1.1.16_eabi.Linux-x86_64/staging_dir/toolchain-arm_cortex-a9_gcc-5.4.0_musl-1.1.16_eabi/bin/arm-openwrt-linux-c++)
 cc_mingw_cross=i686-w64-mingw32-g++-posix
 cc_mac_cross=o64-clang++ -stdlib=libc++
-cc_x86=/toolchains/lede-sdk-17.01.2-x86-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-i386_pentium4_gcc-5.4.0_musl-1.1.16/bin/i486-openwrt-linux-c++
-cc_amd64=/toolchains/lede-sdk-17.01.2-x86-64_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-x86_64_gcc-5.4.0_musl-1.1.16/bin/x86_64-openwrt-linux-c++
-#cc_bcm2708=/home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++ 
+cc_x86=$(shell which c++ || /toolchains/lede-sdk-17.01.2-x86-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-i386_pentium4_gcc-5.4.0_musl-1.1.16/bin/i486-openwrt-linux-c++)
+cc_amd64=$(shell which c++ || /toolchains/lede-sdk-17.01.2-x86-64_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-x86_64_gcc-5.4.0_musl-1.1.16/bin/x86_64-openwrt-linux-c++)
+#cc_bcm2708=$(shell which g++ || /home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++)


 FLAGS= -std=c++11   -Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers ${OPT}
@@ -103,7 +103,7 @@ linux:git_version
 	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2 ${MP}

 freebsd:git_version
-	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2 ${MP}
+	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -libverbs -O2 ${MP}

 mac:git_version
 	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -ggdb -O2 ${MP}
--- a/network.cpp
+++ b/network.cpp
@@ -702,7 +702,7 @@ void init_filter(int port) {
        }
    }

-    int dummy;
+    int dummy=0;

    int ret = setsockopt(raw_recv_fd, SOL_SOCKET, SO_DETACH_FILTER, &dummy, sizeof(dummy));  // in case i forgot to remove
    if (ret != 0) {
@@ -841,7 +841,7 @@ void init_filter(int port) {
 void remove_filter() {
    filter_port = 0;
 #ifdef UDP2RAW_LINUX
-    int dummy;
+    int dummy=0;
    int ret = setsockopt(raw_recv_fd, SOL_SOCKET, SO_DETACH_FILTER, &dummy, sizeof(dummy));
    if (ret != 0) {
        mylog(log_debug, "error remove fiter\n");
--- a/network.h
+++ b/network.h
@@ -226,12 +226,12 @@ struct packet_info_t  // todo change this to union

    bool has_ts;

+    i32_t data_len;
+
 #ifdef UDP2RAW_LINUX
    sockaddr_ll addr_ll;
 #endif

-    i32_t data_len;
-
    packet_info_t();
 };
Author	SHA1	Message	Date
degfw	df4c9f1b3f	Merge `9d1aebde66` into `f49e6adedf`	2023-11-10 13:07:37 -08:00
yancey	f49e6adedf	remove Dockerfile	2023-11-06 03:19:46 -05:00
yancey	d1a9bcc4fb	try to fix linux 6.5 compile	2023-10-07 08:26:10 -04:00
Yancey Wang	bc8bd8c2f8	Merge pull request #475 from gek64/unified Fix compile errors on FreeBSD/pfSense/OPNsense	2023-09-21 16:35:45 -04:00
gek64	ca16c3a5e6	Merge branch 'wangyu-:unified' into unified	2023-07-27 21:10:28 +08:00
Yancey Wang	7abe19c7d9	Merge pull request #482 from wangyu-/revert-455-unified Revert "fix CMakeLists.txt"	2023-07-22 17:31:10 -04:00
gek64	ec416515f3	Fix compile errors on freebsd	2023-06-14 16:26:10 +08:00
degfw	9d1aebde66	Create .gitignore	2023-03-25 06:14:34 +00:00
degfw	dc311f3b92	make graceful to use cc preferably use the compiler(s) pre-installed on the system, then use those from `/toolchains/` if they do not exist, for the convenience of users who have not downloaded toolchains.	2023-03-25 06:13:09 +00:00