Skip to content
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

sync #406

Merged
merged 2 commits into from
Jan 15, 2024
Merged

sync #406

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
5074d85
Use same nft file for all proxy
Ysurac Jan 15, 2024
f10191f
Fix tracker on down interface
Ysurac Jan 15, 2024
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 omr-tracker/files/bin/omr-tracker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ while true; do
}

if [ -n "$OMR_TRACKER_DEVICE" ] && [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
if [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep UP)" ]; then
if [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep 'state UP')" ]; then
# retrieve iface ip and gateway
if ([ "$OMR_TRACKER_FAMILY" = "ipv4" ] || [ "$OMR_TRACKER_FAMILY" = "ipv4ipv6" ]) && [ "$OMR_TRACKER_INTERFACE_PROTO" != "dhcpv6" ]; then
OMR_TRACKER_DEVICE_IP=$(ip -4 -br addr ls dev "$OMR_TRACKER_DEVICE" | awk -F'[ /]+' '{print $3}')
Expand Down
2 changes: 1 addition & 1 deletion shadowsocks-libev/files/shadowsocks-libev.init-nft
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ss_confdir=/var/etc/shadowsocks-libev
ss_bindir=/usr/bin

ssrules_uc="/usr/share/ss-rules/ss-rules.uc"
ssrules_nft="/etc/nftables.d/90-ss-rules.nft"
ssrules_nft="/etc/nftables.d/90-proxy-rules.nft"

ss_mkjson_server_conf() {
local cfgserver
Expand Down
2 changes: 1 addition & 1 deletion shadowsocks-rust/files/shadowsocks-rust.init-nft
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ss_confdir=/var/etc/shadowsocks-rust
ss_bindir=/usr/bin

ssrules_uc="/usr/share/ssr-rules/ss-rules.uc"
ssrules_nft="/etc/nftables.d/90-ssr-rules.nft"
ssrules_nft="/etc/nftables.d/90-proxy-rules.nft"

ss_mkjson_server_conf() {
local cfgserver
Expand Down
2 changes: 1 addition & 1 deletion v2ray-core/files/etc/init.d/v2ray-nft
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ NAME=v2ray
CONFIG_FOLDER=/var/etc/$NAME

v2rrules_uc="/usr/share/v2ray-rules/v2r-rules.uc"
v2rrules_nft="/etc/nftables.d/90-v2r-rules.nft"
v2rrules_nft="/etc/nftables.d/90-proxy-rules.nft"

FILE_V2RAY_DNSMASQ=/tmp/dnsmasq.d/$NAME
FILE_V2RAY_DNSMASQ_CACHE=/tmp/$NAME.dnsmasq.cache
Expand Down
2 changes: 1 addition & 1 deletion xray-core/files/etc/init.d/xray-nft
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ NAME=xray
CONFIG_FOLDER=/var/etc/$NAME

xrrules_uc="/usr/share/xray-rules/xr-rules.uc"
xrrules_nft="/etc/nftables.d/90-xr-rules.nft"
xrrules_nft="/etc/nftables.d/90-proxy-rules.nft"

FILE_XRAY_DNSMASQ=/tmp/dnsmasq.d/$NAME
FILE_XRAY_DNSMASQ_CACHE=/tmp/$NAME.dnsmasq.cache
Expand Down