mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #326 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2023-07-03 23:27:49 +08:00 • committed by GitHub
commit cb07175bad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
golang/golang/Makefile
View file

@ -37,7 +37,8 @@ PKG_CPE_ID:=cpe:/a:golang:go
PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_DIR:=$(BUILD_DIR)/go-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/go-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0 #PKG_USE_MIPS16:=0
PKG_BUILD_FLAGS:=no-mips16
PKG_GO_PREFIX:=/usr PKG_GO_PREFIX:=/usr
PKG_GO_VERSION_ID:=$(GO_VERSION_MAJOR_MINOR) PKG_GO_VERSION_ID:=$(GO_VERSION_MAJOR_MINOR)

BIN
luci-app-omr-bypass/root/usr/share/omr-bypass/omr-bypass.db
View file

Binary file not shown.

6
openmptcprouter/files/etc/firewall.gre-tunnel
View file

@ -6,7 +6,7 @@ if [ -f /usr/sbin/iptables-legacy ]; then
IPTABLESRESTORE="/usr/sbin/iptables-legacy-restore" IPTABLESRESTORE="/usr/sbin/iptables-legacy-restore"
else else
IPTABLESSAVE="/usr/sbin/iptables-save" IPTABLESSAVE="/usr/sbin/iptables-save"
IPTABLESRESTORE="/usr/sbin/iptables-restore" IPTABLESRESTORE="/usr/sbin/iptables-restore --noflush"
fi fi
_setup_rules() { _setup_rules() {
@ -39,7 +39,7 @@ _setup_fw() {
[ -n "$ifnames" ] && rule="$rule -i $(echo "${ifnames}" | sed 's/ /-i /g')" [ -n "$ifnames" ] && rule="$rule -i $(echo "${ifnames}" | sed 's/ /-i /g')"
if [ -n "$rule" ] && [ -n "$lookup" ]; then if [ -n "$rule" ] && [ -n "$lookup" ]; then
$IPTABLESAVE --counters | grep -v "0x${lookup}" | $IPTABLERESTORE -w --counters $IPTABLESAVE --counters | grep -v "0x${lookup}" | $IPTABLERESTORE -w --counters
$IPTABLERESTORE --noflush <<-EOF $IPTABLERESTORE <<-EOF
*mangle *mangle
-A omr-gre-tunnel ${rule} -j MARK --set-mark 0x${lookup} -A omr-gre-tunnel ${rule} -j MARK --set-mark 0x${lookup}
COMMIT COMMIT
@ -48,7 +48,7 @@ _setup_fw() {
} }
if [ -z "$($IPTABLESAVE | grep omr-gre-tunnel)" ]; then if [ -z "$($IPTABLESAVE | grep omr-gre-tunnel)" ]; then
$IPTABLERESTORE --noflush <<-EOF $IPTABLERESTORE <<-EOF
*mangle *mangle
:omr-gre-tunnel - :omr-gre-tunnel -
-I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-gre-tunnel -I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-gre-tunnel

3
v2ray-core/Makefile
View file

@ -18,7 +18,8 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0 ♯PKG_USE_MIPS16:=0
PKG_BUILD_FLAGS:=no-mips16
GO_PKG:=github.com/v2fly/v2ray-core/v5 GO_PKG:=github.com/v2fly/v2ray-core/v5
GO_PKG_BUILD_PKG:=$(GO_PKG)/main GO_PKG_BUILD_PKG:=$(GO_PKG)/main