Compare commits

..

2 Commits

Author SHA1 Message Date
itdoginfo
62ce1f5acc v0.3.30 2025-03-17 14:44:07 +03:00
itdoginfo
93727ddeb5 Processing empty values 2025-03-17 14:43:33 +03:00
3 changed files with 10 additions and 7 deletions

View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-podkop PKG_NAME:=luci-app-podkop
PKG_VERSION:=0.3.29 PKG_VERSION:=0.3.30
PKG_RELEASE:=1 PKG_RELEASE:=1
LUCI_TITLE:=LuCI podkop app LUCI_TITLE:=LuCI podkop app

View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=podkop PKG_NAME:=podkop
PKG_VERSION:=0.3.29 PKG_VERSION:=0.3.30
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=ITDog <podkop@itdog.info> PKG_MAINTAINER:=ITDog <podkop@itdog.info>

View File

@@ -264,16 +264,19 @@ route_table_rule_mark() {
} }
process_interfaces() { process_interfaces() {
local interface="$1" local iface="$1"
INTERFACES_LIST="$INTERFACES_LIST $interface" INTERFACES_LIST="$INTERFACES_LIST $iface"
iface_flag=1
} }
nft_interfaces() { nft_interfaces() {
local table=PodkopTable local table=PodkopTable
iface_flag=0
config_list_foreach "main" "iface" "process_interfaces" config_list_foreach "main" "iface" "process_interfaces"
if [ "$iface_flag" -eq 0 ]; then
if [ $(echo "$INTERFACES_LIST" | wc -w) -eq 1 ]; then SRC_INTERFACE="br-lan"
elif [ $(echo "$INTERFACES_LIST" | wc -w) -eq 1 ]; then
SRC_INTERFACE=$INTERFACES_LIST SRC_INTERFACE=$INTERFACES_LIST
else else
local set_name="interfaces" local set_name="interfaces"
@@ -941,7 +944,7 @@ sing_box_config_outbound_json() {
sing_box_config_shadowsocks() { sing_box_config_shadowsocks() {
local section="$1" local section="$1"
local STRING="$2" local STRING="$2"
local ss_uot="$3" ss_uot="${3:-0}"
if echo "$STRING" | cut -d'/' -f3 | cut -d'@' -f1 | base64 -d 2>/dev/null | grep -q ":"; then if echo "$STRING" | cut -d'/' -f3 | cut -d'@' -f1 | base64 -d 2>/dev/null | grep -q ":"; then
local encrypted_part=$(echo "$STRING" | cut -d'/' -f3 | cut -d'@' -f1 | base64 -d 2>/dev/null ) local encrypted_part=$(echo "$STRING" | cut -d'/' -f3 | cut -d'@' -f1 | base64 -d 2>/dev/null )