Skip to content

Update wing command line in ShadowRocket format, support ss/ssr/trojan/socks5 #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update wing command line in ShadowRocket format, support ss/ssr/trojan/socks5 #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47d34b6
Update gfwlist.txt
Yonsm Apr 19, 2022
285e54c
Update MacOS/Linux/Padavan universal wing to support SS/SSR, command …
Yonsm Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion trunk/libs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/user/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 2 additions & 4 deletions trunk/user/scripts/mtd_storage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions trunk/user/shadowsocks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading