Merge branch 'wing'

Yonsm · Apr 19, 2022 · caecdff · caecdff
2 parents 6da8f66 + 285e54c
commit caecdff
Show file tree

Hide file tree

Showing 6 changed files with 725 additions and 180 deletions.
diff --git a/trunk/libs/Makefile b/trunk/libs/Makefile
@@ -60,7 +60,7 @@ ifeq ($(CONFIG_FIRMWARE_INCLUDE_TTYD),y)
 LIBS_INCLUDE_LIBJSON_C=y
 LIBS_INCLUDE_LIBWEBSOCKETS=y
 endif
-ifeq ($(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS),y)
+ifneq ($(filter y,$(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS) $(CONFIG_FIRMWARE_INCLUDE_WING)),)
 LIBS_INCLUDE_LIBPCRE=y
 LIBS_INCLUDE_LIBEV=y
 LIBS_INCLUDE_LIBSODIUM=y

diff --git a/trunk/user/Makefile b/trunk/user/Makefile
@@ -78,7 +78,7 @@ ifneq ($(filter y,$(CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_CMD) $(CONFIG_FIRMWARE_
 SOFTETHERVPN_ENABLE=y
 endif
 
-ifneq ($(filter y,$(CONFIG_FIRMWARE_INCLUDE_SSSERVER) $(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS)),)
+ifneq ($(filter y,$(CONFIG_FIRMWARE_INCLUDE_SSSERVER) $(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS) $(CONFIG_FIRMWARE_INCLUDE_WING)),)
 SHADOWSOCKS_ENABLE=y
 endif
 

diff --git a/trunk/user/scripts/mtd_storage.sh b/trunk/user/scripts/mtd_storage.sh
@@ -274,8 +274,8 @@ sync && echo 3 > /proc/sys/vm/drop_caches
 # Mount SATA disk
 #mdev -s
 
-#wing <HOST:443> <PASS>
-#wing 192.168.1.9:1080
+#wing start trojan://password@host
+#wing start socks5://192.168.1.9:1080
 #ipset add gfwlist 8.8.4.4
 
 
@@ -508,8 +508,6 @@ EOF
 		cat >> "$user_dnsmasq_conf" <<EOF
 # Custom domains to gfwlist
 #gfwlist=mit.edu
-#gfwlist=openwrt.org,lede-project.org
-#gfwlist=github.com,github.io,githubusercontent.com
 
 EOF
 	fi

diff --git a/trunk/user/shadowsocks/Makefile b/trunk/user/shadowsocks/Makefile
@@ -28,7 +28,7 @@ ifeq ($(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS),y)
 	fi )
 endif
 
-ifeq ($(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS),y)
+ifneq ($(filter y,$(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS) $(CONFIG_FIRMWARE_INCLUDE_WING)),)
 extract_test: extract_ssr_test extract_ss_test
 else
 extract_test: extract_ss_test
@@ -44,7 +44,7 @@ extract_ss_test:
 		tar xf $(SRC_SS_NAME).tar.gz ; \
 	fi )
 
-ifeq ($(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS),y)
+ifneq ($(filter y,$(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS) $(CONFIG_FIRMWARE_INCLUDE_WING)),)
 config_test: config_ssr config_ss
 else
 config_test: config_ss
@@ -105,15 +105,17 @@ clean_ss:
 	fi )
 
 romfs:
+ifneq ($(filter y,$(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS) $(CONFIG_FIRMWARE_INCLUDE_WING)),)
+	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SSR_NAME)/src/ss-redir /usr/bin/ssr-redir
+	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SSR_NAME)/src/ss-local /usr/bin/ssr-local
+	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SS_NAME)/src/ss-redir /usr/bin/ss-orig-redir
+	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SS_NAME)/src/ss-local /usr/bin/ss-orig-local
+endif
 ifeq ($(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS),y)
 	chmod -R +x scripts/
 	$(ROMFSINST) $(THISDIR)/scripts/ /usr/bin/
 	$(ROMFSINST) $(THISDIR)/gfwlist/gfwlist.bz2 /etc_ro/gfwlist.bz2
-	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SSR_NAME)/src/ss-redir /usr/bin/ssr-redir
-	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SSR_NAME)/src/ss-local /usr/bin/ssr-local
-	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SS_NAME)/src/ss-redir /usr/bin/ss-orig-redir
 	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SS_NAME)/src/ss-tunnel /usr/bin/ss-orig-tunnel
-	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SS_NAME)/src/ss-local /usr/bin/ss-orig-local
 	ln -sf /var/ss-redir $(ROMFSDIR)/usr/bin/ss-redir
 	ln -sf /var/ss-tunnel $(ROMFSDIR)/usr/bin/ss-local
 endif