mirror/Socat
1
0
Fork 0
mirror of https://dl.bcrjl.com/ghg/baichal/Socat.git synced 2026-07-22 05:27:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 分析脚本和转发加速完成度

Browse Source 
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
This commit is contained in:
baichal
2026-06-25 03:14:37 +00:00
parent eb240c6b8b
commit 14e713b1bf
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
socat.sh
View File

@@ -494,21 +494,21 @@ json_extract_field() {
local field_name="$2" local field_name="$2"
# 尝试匹配字符串值: "field":"value" # 尝试匹配字符串值: "field":"value"
local str_val=$(echo "$json_str" | grep -o '"'"$field_name"'":"[^"]*"' | head -n1 | sed 's/^"[^"]*":"//;s/"$//') local str_val=$(echo "$json_str" | grep -oE "\"${field_name}\":\"[^\"]*\"" | head -n1 | sed 's/^[^:]*://;s/"$//;s/^"//')
if [[ -n "$str_val" ]]; then if [[ -n "$str_val" ]]; then
echo "$str_val" echo "$str_val"
return 0 return 0
fi fi
# 尝试匹配数字值: "field":123 # 尝试匹配数字值: "field":123
local num_val=$(echo "$json_str" | grep -o '"'"$field_name"'":[0-9]*' | head -n1 | sed 's/^"[^"]*"://') local num_val=$(echo "$json_str" | grep -oE "\"${field_name}\":[0-9]+" | head -n1 | sed 's/^[^:]*://')
if [[ -n "$num_val" ]]; then if [[ -n "$num_val" ]]; then
echo "$num_val" echo "$num_val"
return 0 return 0
fi fi
# 尝试匹配数组值: "field":["a","b"] # 尝试匹配数组值: "field":["a","b"]
local arr_val=$(echo "$json_str" | grep -o '"'"$field_name"'":\[[^]]*\]' | head -n1 | sed 's/^"[^"]*":\[//;s/\]$//' | tr -d '"' | tr ',' ' ') local arr_val=$(echo "$json_str" | grep -oE "\"${field_name}\":\[[^\]]*\]" | head -n1 | sed 's/^[^:]*:\[\(.*\)\]/\1/' | tr -d '"' | tr ',' ' ')
if [[ -n "$arr_val" ]]; then if [[ -n "$arr_val" ]]; then
echo "$arr_val" echo "$arr_val"
return 0 return 0
@@ -1296,10 +1296,15 @@ create_single_socat_service() {
# 旧格式兼容：纯路径 # 旧格式兼容：纯路径
unix_path="$extra" unix_path="$extra"
# 通过 target_ip 判断方向 # 通过 target_ip 判断方向
if [[ "$target_ip" == "127.0.0.1:${target_port}" ]]; then # - 如果 target_ip 等于 extra 路径本身：TCP->UNIX（target_ip存的是socket路径）
unix_direction="unix2tcp" # - 如果 target_ip 是 "127.0.0.1" 或 "127.0.0.1:端口"：UNIX->TCP
elif [[ "$target_ip" == "$extra" ]]; then if [[ "$target_ip" == "$extra" ]]; then
unix_direction="tcp2unix" unix_direction="tcp2unix"
elif [[ "$target_ip" == "127.0.0.1" ]]; then
unix_direction="unix2tcp"
elif [[ "$target_ip" == 127.0.0.1:* ]]; then
# 旧格式：127.0.0.1:端口
unix_direction="unix2tcp"
else else
unix_direction="tcp2unix" # 默认TCP->UNIX unix_direction="tcp2unix" # 默认TCP->UNIX
fi fi
@@ -1669,13 +1674,21 @@ view_delete_forward() {
remove_forward() { remove_forward() {
local listen_port=$1 local listen_port=$1
local ip_type=$2 local ip_type=$2
local protocols_raw=$3 # 空格分隔的协议列表，如 "tcp udp" local protocols_raw=$3 # JSON数组格式（如 ["tcp","udp"]）或空格分隔格式
local extra_raw=$4 # 额外参数（UNIX路径/代理地址） local extra_raw=$4 # 额外参数（UNIX路径/代理地址）
# 解析协议列表 # 解析协议列表（支持JSON数组格式和空格分隔格式）
local protocols=() local protocols=()
if [[ -n "$protocols_raw" && "$protocols_raw" != "null" ]]; then if [[ -n "$protocols_raw" && "$protocols_raw" != "null" ]]; then
protocols=($protocols_raw) # 检测是否为JSON数组格式（包含 [ 或 ]）
if [[ "$protocols_raw" == *'['* ]] || [[ "$protocols_raw" == *']'* ]]; then
# JSON数组格式：["tcp","udp"] -> tcp udp
local parsed=$(echo "$protocols_raw" | tr -d '[]"' | tr ',' ' ' | xargs)
IFS=' ' read -ra protocols <<< "$parsed"
else
# 空格分隔格式
IFS=' ' read -ra protocols <<< "$protocols_raw"
fi
else else
protocols=("tcp" "udp") protocols=("tcp" "udp")
fi fi