M1rs3m/BFR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improved scripts

Browse Source
This commit is contained in:
sheynsw
2023-05-06 02:54:59 +07:00
parent c3d67d39ec
commit e0eceb32e5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
box/scripts/box.iptables
View File

@@ -173,7 +173,7 @@ start_redirect() {
# check proxy mode
if [ "${proxy_mode}" = "blacklist" ]; then
# check if uid list is empty
if [ "$(cat "${uid_list[@]}")" = "" ]; then
if [ -z "$(cat "${uid_list[@]}")" ] ; then
# Route Everything
${iptables} -t nat -A BOX_LOCAL -p tcp -j REDIRECT --to-ports "${redir_port}"
log info "Transparent proxy for all apps."
@@ -183,7 +183,7 @@ start_redirect() {
while read -r appid; do
# add iptables rules for returning packets
${iptables} -t nat -I BOX_LOCAL -m owner --uid-owner "${appid}" -j RETURN
done < "${uid_list[*]}"
done < "${uid_list[@]}"
# close the file handle for the UID list
# exec <&-
@@ -193,7 +193,7 @@ start_redirect() {
log info "proxy-mode: ${proxy_mode} < [ ${packages_list[*]} ] no transparent proxy."
fi
elif [ "${proxy_mode}" = "whitelist" ]; then
if [ "$(cat "${uid_list[@]}")" = "" ]; then
if [ -z "$(cat "${uid_list[@]}")" ] ; then
# Route Everything
${iptables} -t nat -A BOX_LOCAL -p tcp -j REDIRECT --to-ports "${redir_port}"
log info "Transparent proxy for all apps."
@@ -203,7 +203,7 @@ start_redirect() {
while read -r appid; do
# add iptables rules for TCP traffic
${iptables} -t nat -A BOX_LOCAL -p tcp -m owner --uid-owner "${appid}" -j REDIRECT --to-ports "${redir_port}"
done < "${uid_list[*]}"
done < "${uid_list[@]}"
# close the file handle for the UID list
# exec <&-
@@ -367,7 +367,7 @@ start_tproxy() {
# ${iptables} -t mangle -A BOX_LOCAL -m owner ! --uid 0-99999999 -j DROP
if [ "${proxy_mode}" = "blacklist" ]; then
if [ "$(cat ${uid_list[@]})" = "" ]; then
if [ -z "$(cat "${uid_list[@]}")" ] ; then
# Route Everything
${iptables} -t mangle -A BOX_LOCAL -p tcp -j MARK --set-mark "${fwmark}"
${iptables} -t mangle -A BOX_LOCAL -p udp -j MARK --set-mark "${fwmark}"
@@ -377,7 +377,7 @@ start_tproxy() {
while read -r appid; do
${iptables} -t mangle -I BOX_LOCAL -m owner --uid-owner "${appid}" -j RETURN
done < "${uid_list[*]}"
done < "${uid_list[@]}"
# close the file handle for the UID list
# exec <&-
@@ -389,7 +389,7 @@ start_tproxy() {
fi
elif [ "${proxy_mode}" = "whitelist" ]; then
if [ "$(cat "${uid_list[@]}")" = "" ]; then
if [ -z "$(cat "${uid_list[@]}")" ] ; then
# Route Everything
${iptables} -t mangle -A BOX_LOCAL -p tcp -j MARK --set-mark "${fwmark}"
${iptables} -t mangle -A BOX_LOCAL -p udp -j MARK --set-mark "${fwmark}"
@@ -400,7 +400,7 @@ start_tproxy() {
while read -r appid; do
${iptables} -t mangle -A BOX_LOCAL -p tcp -m owner --uid-owner "${appid}" -j MARK --set-mark "${fwmark}"
${iptables} -t mangle -A BOX_LOCAL -p udp -m owner --uid-owner "${appid}" -j MARK --set-mark "${fwmark}"
done < "${uid_list[*]}"
done < "${uid_list[@]}"
# close the file handle for the UID list
# exec <&-

4
box/scripts/box.service
View File

@@ -158,8 +158,8 @@ prepare_singbox() {
}
prepare_clash() {
ipv6=$(busybox awk '/ipv6:/ { print $2; found=1; exit } END{ if(!found) print "false" }' "${clash_config}" | head -n 1 2>/dev/null)
sed -i "s/ipv6=.*/ipv6=\"${ipv6}\"/g" "${settings}"
# ipv6=$(busybox awk '/ipv6:/ { print $2; found=1; exit } END{ if(!found) print "false" }' "${clash_config}" | head -n 1 2>/dev/null)
sed -i "s/ipv6:.*/ipv6: ${ipv6}/g" "${clash_config}"
clash_external_ui=$(busybox awk '/external-ui: /{print $1}' "${clash_config}")
if [ -z "${clash_external_ui}" ]; then