From 82d65b8f9696ba9be7cdf807e0524a2f93b2bc7a Mon Sep 17 00:00:00 2001 From: Vadim Vetrov Date: Mon, 5 Aug 2024 16:12:59 +0300 Subject: [PATCH] Support for openWRT SDK build system --- Makefile | 14 +++++++------- README.md | 4 ++++ owrt/youtubeUnblock.owrt | 0 3 files changed, 11 insertions(+), 7 deletions(-) mode change 100644 => 100755 owrt/youtubeUnblock.owrt diff --git a/Makefile b/Makefile index 672d989..27a9377 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ BUILD_DIR := $(CURDIR)/build DEPSDIR := $(BUILD_DIR)/deps -CC := gcc -CCLD := $(CC) -LD := ld -CFLAGS:=-Wall -Wpedantic -Wno-unused-variable -I$(DEPSDIR)/include -Os -LDFLAGS:=-L$(DEPSDIR)/lib -static +CC:=gcc +CCLD:=$(CC) +LD:=ld +override CFLAGS += -Wall -Wpedantic -Wno-unused-variable -I$(DEPSDIR)/include +override LDFLAGS += -L$(DEPSDIR)/lib LIBNFNETLINK_CFLAGS := -I$(DEPSDIR)/include LIBNFNETLINK_LIBS := -L$(DEPSDIR)/lib @@ -65,11 +65,11 @@ $(LIBNETFILTER_QUEUE): $(LIBNFNETLINK) $(LIBMNL) $(APP): $(OBJS) $(LIBNETFILTER_QUEUE) $(LIBMNL) @echo 'CCLD $(APP)' - @$(CCLD) $(OBJS) -o $(APP) -L$(DEPSDIR)/lib -lmnl -lnetfilter_queue + $(CCLD) $(OBJS) -o $(APP) $(LDFLAGS) -lmnl -lnetfilter_queue $(BUILD_DIR)/%.o: %.c $(LIBNETFILTER_QUEUE) $(LIBMNL) @echo 'CC $@' - @$(CC) -c $(CFLAGS) $^ -o $@ + $(CC) -c $(CFLAGS) $(LDFLAGS) $< -o $@ install: all install -d $(PREFIX)/bin/ diff --git a/README.md b/README.md index dc1c077..d28f8cc 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,10 @@ Also you can copy `owrt/537-youtubeUnblock.nft` to `/usr/share/nftables.d/rulese Next step is to daemonize the application in openwrt. Copy `owrt/youtubeUnblock.owrt` to `/etc/init.d/youtubeUnblock` and put the program into /usr/bin/. (Don't forget to `chmod +x` both). Now run `/etc/init.d/youtubeUnblock start`. You can alo run `/etc/init.d/youtubeUnblock enable` to force OpenWRT autostart the program on boot, but I don't recommend this since if the packet has bug you may lose access to the router (I think you will be able to reset it with reset settings tricks documented for your router). +## Building OpenWRT .ipk package +OpenWRT provides a high-level SDK for package to be built. Next I will describe how to build the package fully compatible with your router. This way requires more steps but is preferred because it will produce ready-to-manage opkg package. +First step is to download or compile OpenWRT SDK for your specific platform. The SDK can be compiled according to [this tutorial](https://openwrt.org/docs/guide-developer/toolchain/using_the_sdk). Beside of raw source code of SDK OpenWRT also offers precompiled SDKs for your router. You can find it near the toolchain from previous section. It is called openwrt-sdk-23.05.3-ramips-mt76x8_gcc-12.3.0_musl.Linux-x86_64 for me. You will need to [install build system requirements on your system](https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem) If you have any problems, use docker ubuntu:24.04 image. Next untar the SDK, cd it. Do `echo "src-git youtubeUnblock https://github.com/Waujito/youtubeUnblock.git;openwrt" >> feeds.conf`, `./scripts/feeds update -a youtubeUnblock`, `./scripts/feeds install -a -p youtubeUnblock`, `make package/youtubeUnblock/compile`. Now the packet is built and you can import it to the router. Find it in `bin/packages//youtubeUnblock/youtubeUnblock-.ipk`. Go to your router interface and put it via System-Software-install_package. Now the package is on the router. Goto System-Startup, restart firewall and start youtubeUnblock. You are done! + ## Performance If you have bad performance you can queue to youtubeUnblock only first, say, 20 packets from the connection. To do so, use nftables conntrack packets counter: `nft add rule inet fw4 mangle_forward tcp dport 443 ct original "packets < 20" counter queue num 537 bypass`. For my 1 CPU core device it worked pretty well. This works because we do care about only first packets with ClientHello. We don't need to process others. diff --git a/owrt/youtubeUnblock.owrt b/owrt/youtubeUnblock.owrt old mode 100644 new mode 100755