OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20944 from stangri/master-https-dns-proxy 

https-dns-proxy: fixes/improvements
This commit is contained in:
Stan Grishin 2023-05-08 19:44:57 -06:00 committed by GitHub
parent 34a5faf6c3 25801ddf74
commit ee794aab11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/https-dns-proxy/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=https-dns-proxy PKG_NAME:=https-dns-proxy
PKG_VERSION:=2022-10-15 PKG_VERSION:=2022-10-15
PKG_RELEASE:=11 PKG_RELEASE:=12
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/

3
net/https-dns-proxy/files/https-dns-proxy.init
View File

@ -17,7 +17,6 @@ fi
readonly PKG_VERSION='dev-test' readonly PKG_VERSION='dev-test'
readonly packageName='https-dns-proxy' readonly packageName='https-dns-proxy'
readonly serviceName="$packageName $PKG_VERSION" readonly serviceName="$packageName $PKG_VERSION"
readonly sharedMemoryOutput="/dev/shm/$packageName-output"
readonly _OK_='\033[0;32m\xe2\x9c\x93\033[0m' readonly _OK_='\033[0;32m\xe2\x9c\x93\033[0m'
readonly _FAIL_='\033[0;31m\xe2\x9c\x97\033[0m' readonly _FAIL_='\033[0;31m\xe2\x9c\x97\033[0m'
readonly PROG=/usr/sbin/https-dns-proxy readonly PROG=/usr/sbin/https-dns-proxy
@ -33,6 +32,7 @@ is_ipv4() { expr "$1" : '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' >/
is_ipv6() { ! is_mac_address "$1" && str_contains "$1" ":"; } is_ipv6() { ! is_mac_address "$1" && str_contains "$1" ":"; }
output() { output() {
local msg memmsg logmsg local msg memmsg logmsg
local sharedMemoryOutput="/dev/shm/$packageName-output"
[ -t 1 ] && printf "%b" "$@" [ -t 1 ] && printf "%b" "$@"
msg="${1//$serviceName /service }"; msg="${1//$serviceName /service }";
if [ "$(printf "%b" "$msg" | wc -l)" -gt 0 ]; then if [ "$(printf "%b" "$msg" | wc -l)" -gt 0 ]; then
@ -171,6 +171,7 @@ start_instance() {
json_add_string proto 'tcp udp' json_add_string proto 'tcp udp'
json_add_string src_dport "$p" json_add_string src_dport "$p"
json_add_string dest_port "$p" json_add_string dest_port "$p"
json_add_string family any
json_add_boolean reflection 0 json_add_boolean reflection 0
json_close_object json_close_object
else else