mirror of
https://github.com/wangyu-/udp2raw.git
synced 2025-09-19 21:54:28 +08:00
update 3rd party
This commit is contained in:
wangyu-
@@ -1,6 +1,6 @@
|
||||
|
||||
config general 'general'
|
||||
option server 'nil'
|
||||
list server 'nil'
|
||||
option daemon_user 'root'
|
||||
|
||||
config servers 'default'
|
||||
|
||||
@@ -1,51 +1,56 @@
|
||||
#!/bin/sh /etc/rc.common
|
||||
|
||||
START=88
|
||||
STOP=15
|
||||
USE_PROCD=1
|
||||
|
||||
UDP2RAW=udp2raw
|
||||
NAME=udp2raw
|
||||
|
||||
_log() {
|
||||
local level="$1"
|
||||
local msg="$2"
|
||||
|
||||
logger -p "daemon.${level}" -t "$UDP2RAW" "$msg"
|
||||
logger -p "daemon.$1" -t "$NAME" "$2"
|
||||
}
|
||||
|
||||
gen_client_config_file() {
|
||||
has_valid_server() {
|
||||
local server
|
||||
for server in $@; do
|
||||
[ "$(uci_get $NAME $server)" = "servers" ] && return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
create_config() {
|
||||
local config_file="$1"
|
||||
echo "# auto-generated config file from /etc/config/udp2raw" > $config_file
|
||||
|
||||
echo "-c" >> $config_file
|
||||
echo "-l ${listen_addr}:${listen_port}" >> $config_file && _log "info" "listening on: ${listen_addr}:${listen_port}"
|
||||
echo "-r ${server_addr}:${server_port}" >> $config_file && _log "info" "remote address: ${server_addr}:${server_port}"
|
||||
echo "-l ${listen_addr:=127.0.0.1}:${listen_port:=2080}" >> $config_file && _log "info" "listening on: ${listen_addr}:${listen_port}"
|
||||
echo "-r ${server_addr}:${server_port:=8080}" >> $config_file
|
||||
|
||||
[ -n "$raw_mode" ] && echo "--raw-mode ${raw_mode}" >> $config_file && _log "info" "raw-mode: ${raw_mode}"
|
||||
[ -n "$key" ] && echo "--key ${key}" >> $config_file
|
||||
[ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file && _log "info" "cipher-mode: ${cipher_mode}"
|
||||
[ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file && _log "info" "auth-mode: ${auth_mode}"
|
||||
[ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file
|
||||
[ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file
|
||||
|
||||
[ "$auto_rule" -ne 0 ] && echo "--auto-rule" >> $config_file && _log "info" "auto-rule: true"
|
||||
[ "$auto_rule" -ne 0 -a "$keep_rule" -ne 0 ] && echo "--keep-rule" >> $config_file && _log "info" "keep-rule: true"
|
||||
[ $auto_rule -eq 1 ] && echo "--auto-rule" >> $config_file
|
||||
[ $auto_rule -eq 1 -a $keep_rule -eq 1 ] && echo "--keep-rule" >> $config_file
|
||||
|
||||
[ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file && _log "info" "seq-mode: ${seq_mode}"
|
||||
[ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file && _log "info" "lower-level: ${lower_level}"
|
||||
[ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file
|
||||
[ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file
|
||||
[ -n "$source_ip" ] && echo "--source-ip ${source_ip}" >> $config_file
|
||||
[ -n "$source_port" ] && echo "--source-port ${source_port}" >> $config_file
|
||||
|
||||
[ -n "$log_level" ] && echo "--log-level ${log_level}" >> $config_file
|
||||
echo "--disable-color" >> $config_file
|
||||
_log "info" "running from ${daemon_user} user"
|
||||
}
|
||||
|
||||
validate_config_section() {
|
||||
uci_validate_section "$UDP2RAW" general "$1" \
|
||||
uci_validate_section "$NAME" general "$1" \
|
||||
'server:uciname' \
|
||||
'daemon_user:string:root'
|
||||
}
|
||||
|
||||
validate_server_section() {
|
||||
uci_validate_section "$UDP2RAW" servers "$1" \
|
||||
uci_validate_section "$NAME" servers "$1" \
|
||||
'server_addr:host' \
|
||||
'server_port:port:8080' \
|
||||
'listen_addr:ipaddr:127.0.0.1' \
|
||||
@@ -63,59 +68,49 @@ validate_server_section() {
|
||||
'log_level:range(0,6)'
|
||||
}
|
||||
|
||||
start_udp2raw_instance() {
|
||||
local section="$1"
|
||||
start_instance() {
|
||||
local server="$1"
|
||||
|
||||
if ! validate_config_section "$section" ; then
|
||||
_log "err" "Config validate failed."
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ -z "$server" ] || [ "$server" = "nil" ]; then
|
||||
if [ -z "$server" -o "$server" == "nil" ]; then
|
||||
return 0
|
||||
elif ! validate_server_section "$server"; then
|
||||
_log "err" "Server config validation failed."
|
||||
return 1
|
||||
elif [ -z "$server_addr" ]; then
|
||||
fi
|
||||
|
||||
/sbin/validate_data "ipaddr" "$server_addr" >/dev/null 2>&1
|
||||
[ $? -ne 0 ] && server_addr=$(nslookup "$server_addr" | \
|
||||
sed -n 's/^Address[[:space:]]*[0-9]*:[[:space:]]*\(\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\)$/\1/p')
|
||||
if [ -z "$server_addr" ]; then
|
||||
_log "err" "Server address validation failed."
|
||||
return 1
|
||||
fi
|
||||
|
||||
is_ipv6_address() {
|
||||
echo "$1" | grep -q ":"
|
||||
}
|
||||
|
||||
is_ipv6_address "$server_addr" && server_addr="[${server_addr}]"
|
||||
is_ipv6_address "$listen_addr" && listen_addr="[${listen_addr}]"
|
||||
|
||||
_log "notice" "udp2raw-tunnel start."
|
||||
[ -d /var/etc ] || mkdir -p /var/etc
|
||||
local config_file=/var/etc/${UDP2RAW}.${server}.conf
|
||||
|
||||
if ! ( gen_client_config_file "$config_file" ); then
|
||||
_log "err" "Can't create config file".
|
||||
return 1
|
||||
fi
|
||||
local config_file="/var/etc/${NAME}.${server}.conf"
|
||||
create_config "$config_file" || return 1
|
||||
|
||||
procd_open_instance
|
||||
procd_set_param command /usr/bin/udp2raw
|
||||
procd_append_param command --conf-file "$config_file"
|
||||
procd_set_param respawn
|
||||
procd_set_param file "$config_file"
|
||||
procd_set_param user "$daemon_user"
|
||||
procd_set_param pidfile /var/run/${UDP2RAW}.${server}.pid
|
||||
[ -n "$daemon_user" ] && procd_set_param user "$daemon_user" && _log "info" "running from ${daemon_user} user"
|
||||
procd_set_param pidfile "/var/run/${NAME}.${server}.pid"
|
||||
procd_close_instance
|
||||
}
|
||||
|
||||
service_triggers() {
|
||||
procd_add_reload_trigger "$UDP2RAW"
|
||||
procd_add_reload_trigger "$NAME"
|
||||
}
|
||||
|
||||
start_service() {
|
||||
config_load "$UDP2RAW"
|
||||
config_foreach start_udp2raw_instance "general"
|
||||
}
|
||||
|
||||
stop_service() {
|
||||
_log "notice" "udp2raw-tunnel stop."
|
||||
if ! validate_config_section "general" ; then
|
||||
_log "err" "Config validate failed."
|
||||
return 1
|
||||
fi
|
||||
has_valid_server $server || return 1
|
||||
for srv in $server; do
|
||||
start_instance $srv
|
||||
done
|
||||
}
|
||||
|
||||
130
third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init
vendored
Normal file
130
third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init
vendored
Normal file
@@ -0,0 +1,130 @@
|
||||
#!/bin/sh /etc/rc.common
|
||||
|
||||
START=88
|
||||
STOP=15
|
||||
|
||||
NAME=udp2raw
|
||||
|
||||
_log() {
|
||||
logger -p "daemon.$1" -t "$NAME" "$2"
|
||||
}
|
||||
|
||||
has_valid_server() {
|
||||
local server
|
||||
for server in $@; do
|
||||
[ "$(uci_get $NAME $server)" = "servers" ] && return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
create_config() {
|
||||
local config_file="$1"
|
||||
echo "# auto-generated config file from /etc/config/udp2raw" > $config_file
|
||||
|
||||
echo "-c" >> $config_file
|
||||
echo "-l ${listen_addr:=127.0.0.1}:${listen_port:=2080}" >> $config_file
|
||||
echo "-r ${server_addr}:${server_port:=8080}" >> $config_file
|
||||
|
||||
[ -n "$raw_mode" ] && echo "--raw-mode ${raw_mode}" >> $config_file
|
||||
[ -n "$key" ] && echo "--key ${key}" >> $config_file
|
||||
[ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file
|
||||
[ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file
|
||||
|
||||
[ $auto_rule -eq 1 ] && echo "--auto-rule" >> $config_file
|
||||
[ $auto_rule -eq 1 -a $keep_rule -eq 1 ] && echo "--keep-rule" >> $config_file
|
||||
|
||||
[ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file
|
||||
[ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file
|
||||
[ -n "$source_ip" ] && echo "--source-ip ${source_ip}" >> $config_file
|
||||
[ -n "$source_port" ] && echo "--source-port ${source_port}" >> $config_file
|
||||
|
||||
[ -n "$log_level" ] && echo "--log-level ${log_level}" >> $config_file
|
||||
echo "--disable-color" >> $config_file
|
||||
}
|
||||
|
||||
validate_config_section() {
|
||||
local ret=$(/sbin/validate_data "$NAME" general "$1" \
|
||||
'server:uciname' \
|
||||
'daemon_user:string:root' \
|
||||
2> /dev/null)
|
||||
[ $? -ne 0 ] && return 1
|
||||
eval "$ret"
|
||||
}
|
||||
|
||||
validate_server_section() {
|
||||
local ret=$(/sbin/validate_data "$NAME" servers "$1" \
|
||||
'server_addr:host' \
|
||||
'server_port:port:8080' \
|
||||
'listen_addr:ipaddr:127.0.0.1' \
|
||||
'listen_port:port:2080' \
|
||||
'raw_mode:or("faketcp", "udp", "icmp"):faketcp' \
|
||||
'key:string' \
|
||||
'cipher_mode:or("aes128cbc", "xor", "none"):aes128cbc' \
|
||||
'auth_mode:or("md5", "crc32", "simple", "none"):md5' \
|
||||
'auto_rule:bool:1' \
|
||||
'keep_rule:bool:0' \
|
||||
'seq_mode:range(0,4)' \
|
||||
'lower_level:string' \
|
||||
'source_ip:ipaddr' \
|
||||
'source_port:port' \
|
||||
'log_level:range(0,6)' \
|
||||
2> /dev/null)
|
||||
[ $? -ne 0 ] && return 1
|
||||
eval "$ret"
|
||||
}
|
||||
|
||||
start_instance() {
|
||||
local server="$1"
|
||||
|
||||
if [ -z "$server" -o "$server" == "nil" ]; then
|
||||
return 0
|
||||
elif ! validate_server_section "$server"; then
|
||||
_log "err" "Server config validation failed."
|
||||
return 1
|
||||
fi
|
||||
|
||||
/sbin/validate_data "ipaddr" "$server_addr" >/dev/null 2>&1
|
||||
[ $? -ne 0 ] && server_addr=$(nslookup "$server_addr" | \
|
||||
sed -n 's/^Address[[:space:]]*[0-9]*:[[:space:]]*\(\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\)$/\1/p')
|
||||
if [ -z "$server_addr" ]; then
|
||||
_log "err" "Server address validation failed."
|
||||
return 1
|
||||
fi
|
||||
|
||||
[ -d /var/etc ] || mkdir -p /var/etc
|
||||
local config_file="/var/etc/${NAME}.${server}.conf"
|
||||
create_config "$config_file" || return 1
|
||||
[ -d "/var/log/${NAME}" ] || mkdir -p "/var/log/${NAME}"
|
||||
|
||||
/usr/bin/udp2raw --conf-file "$config_file" >> "/var/log/${NAME}/${NAME}.${server}.log" &
|
||||
echo $! > "/var/run/${NAME}.${server}.pid"
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
pgrep "/usr/bin/${NAME}" >/dev/null 2>&1 && return
|
||||
|
||||
if ! validate_config_section "general" ; then
|
||||
_log "err" "Config validate failed."
|
||||
return 1
|
||||
fi
|
||||
has_valid_server $server || return 1
|
||||
for srv in $server; do
|
||||
start_instance $srv
|
||||
done
|
||||
}
|
||||
|
||||
stop() {
|
||||
local pids=$(pgrep "/usr/bin/${NAME}" 2> /dev/null)
|
||||
[ $? -ne 0 ] && return
|
||||
for pid in $pids; do
|
||||
kill $pid >/dev/null 2>&1
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
restart() {
|
||||
stop
|
||||
sleep 1
|
||||
start
|
||||
}
|
||||
@@ -8,11 +8,9 @@ uci -q batch <<-EOF >/dev/null
|
||||
EOF
|
||||
|
||||
general=$(uci -q get udp2raw.@general[-1])
|
||||
|
||||
if [ -z "$general" ]; then
|
||||
uci -q add udp2raw general
|
||||
fi
|
||||
|
||||
if [ ."$general" != ."general" ]; then
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
rename udp2raw.@general[-1]="general"
|
||||
|
||||
Reference in New Issue
Block a user