Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mirrors
openwrt
packages
提交
f25b34fc
P
packages
项目概览
mirrors
/
openwrt
/
packages
大约 1 年 前同步成功
通知
16
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
packages
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
f25b34fc
编写于
9月 03, 2023
作者:
S
Stan Grishin
提交者:
GitHub
9月 03, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22015 from stangri/master-https-dns-proxy
https-dns-proxy: fix dns resolution not working on boot
上级
49ea9e04
9a2c5ae1
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
34 addition
and
25 deletion
+34
-25
net/https-dns-proxy/Makefile
net/https-dns-proxy/Makefile
+8
-7
net/https-dns-proxy/files/etc/config/https-dns-proxy
net/https-dns-proxy/files/etc/config/https-dns-proxy
+0
-0
net/https-dns-proxy/files/etc/hotplug.d/online/30-https-dns-proxy
...s-dns-proxy/files/etc/hotplug.d/online/30-https-dns-proxy
+2
-0
net/https-dns-proxy/files/etc/init.d/https-dns-proxy
net/https-dns-proxy/files/etc/init.d/https-dns-proxy
+24
-12
net/https-dns-proxy/files/etc/uci-defaults/50-https-dns-proxy-migrate-options.sh
...es/etc/uci-defaults/50-https-dns-proxy-migrate-options.sh
+0
-0
net/https-dns-proxy/files/https-dns-proxy.hotplug.iface
net/https-dns-proxy/files/https-dns-proxy.hotplug.iface
+0
-6
未找到文件。
net/https-dns-proxy/Makefile
浏览文件 @
f25b34fc
...
...
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME
:=
https-dns-proxy
PKG_VERSION
:=
2023-05-25
PKG_RELEASE
:=
3
PKG_RELEASE
:=
4
PKG_SOURCE_PROTO
:=
git
PKG_SOURCE_URL
:=
https://github.com/aarond10/https_dns_proxy/
...
...
@@ -39,15 +39,16 @@ endef
define
Package/https-dns-proxy/install
$(INSTALL_DIR)
$(1)/usr/sbin
$(INSTALL_BIN)
$(PKG_BUILD_DIR)/https_dns_proxy
$(1)/usr/sbin/https-dns-proxy
$(INSTALL_DIR)
$(1)/etc/init.d
$(INSTALL_BIN)
./files/etc/init.d/https-dns-proxy
$(1)/etc/init.d/https-dns-proxy
$(SED)
"s|^\(readonly PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|"
$(1)/etc/init.d/https-dns-proxy
$(INSTALL_DIR)
$(1)/etc/config
$(INSTALL_DIR)
$(1)/etc/hotplug.d/iface
$(INSTALL_CONF)
./files/etc/config/https-dns-proxy
$(1)/etc/config/https-dns-proxy
$(INSTALL_DIR)
$(1)/etc/hotplug.d/online
$(INSTALL_DATA)
./files/etc/hotplug.d/online/30-https-dns-proxy
$(1)/etc/hotplug.d/online/30-https-dns-proxy
$(INSTALL_DIR)
$(1)/etc/uci-defaults/
$(INSTALL_BIN)
$(PKG_BUILD_DIR)/https_dns_proxy
$(1)/usr/sbin/https-dns-proxy
$(INSTALL_BIN)
./files/https-dns-proxy.init
$(1)/etc/init.d/https-dns-proxy
$(SED)
"s|^\(readonly PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|"
$(1)/etc/init.d/https-dns-proxy
$(INSTALL_CONF)
./files/https-dns-proxy.config
$(1)/etc/config/https-dns-proxy
$(INSTALL_BIN)
./files/https-dns-proxy.defaults
$(1)/etc/uci-defaults/50-https-dns-proxy-migrate-options.sh
$(INSTALL_BIN)
./files/etc/uci-defaults/50-https-dns-proxy-migrate-options.sh
$(1)/etc/uci-defaults/50-https-dns-proxy-migrate-options.sh
endef
$(eval
$(call
BuildPackage,https-dns-proxy))
net/https-dns-proxy/files/
https-dns-proxy.config
→
net/https-dns-proxy/files/
etc/config/https-dns-proxy
浏览文件 @
f25b34fc
文件已移动
net/https-dns-proxy/files/etc/hotplug.d/online/30-https-dns-proxy
0 → 100644
浏览文件 @
f25b34fc
#!/bin/sh
/etc/init.d/https-dns-proxy start
'on_hotplug'
net/https-dns-proxy/files/
https-dns-proxy.init
→
net/https-dns-proxy/files/
etc/init.d/https-dns-proxy
浏览文件 @
f25b34fc
#!/bin/sh /etc/rc.common
# Copyright 2019-202
2
Stan Grishin (stangri@melmac.ca)
# Copyright 2019-202
3
Stan Grishin (stangri@melmac.ca)
# shellcheck disable=SC1091,SC3043,SC3060
# shellcheck disable=SC2034
START
=
9
5
START
=
9
0
# shellcheck disable=SC2034
USE_PROCD
=
1
...
...
@@ -71,7 +71,7 @@ dnsmasq_restart() { [ -x /etc/init.d/dnsmasq ] || return 1; /etc/init.d/dnsmasq
version
()
{
echo
"
$PKG_VERSION
"
;
}
xappend
()
{
param
=
"
$
param
$1
"
;
}
xappend
()
{
PROG_param
=
"
$PROG_
param
$1
"
;
}
append_bool
()
{
local
section
=
"
$1
"
...
...
@@ -127,13 +127,18 @@ append_bootstrap() {
[
"
$ipv6_resolvers_only
"
-eq
0
]
&&
xappend
'-4'
}
resolver_health_check
()
{
resolveip
-t
3 one.one.one.one
>
/dev/null 2>&1
;
}
boot
()
{
ubus
-t
30 wait_for network.interface 2>/dev/null
rc_procd start_service
'on_boot'
resolver_health_check
||
rc_procd stop_service
'on_boot'
}
start_instance
()
{
local
cfg
=
"
$1
"
param listen_addr listen_port ipv6_resolvers_only p url iface
local
cfg
=
"
$1
"
param
=
"
$2
"
local
PROG_param
local
listen_addr listen_port ipv6_resolvers_only p url iface
config_get url
"
$cfg
"
'resolver_url'
config_get_bool ipv6_resolvers_only
"
$cfg
"
'use_ipv6_resolvers_only'
'0'
...
...
@@ -153,7 +158,7 @@ start_instance() {
procd_open_instance
# shellcheck disable=SC2086
procd_set_param
command
$PROG
$param
procd_set_param
command
$PROG
$
PROG_
param
procd_set_param stderr 1
procd_set_param stdout 1
procd_set_param respawn
...
...
@@ -161,7 +166,6 @@ start_instance() {
json_add_object mdns
procd_add_mdns_service
"
$packageName
"
'udp'
"
$port
"
"DNS over HTTPS proxy"
json_close_object
json_add_string url
"
$url
"
if
[
"
$force_dns
"
-ne
0
]
;
then
json_add_array firewall
for
iface
in
$procd_fw_src_interfaces
;
do
...
...
@@ -218,12 +222,13 @@ start_instance() {
}
start_service
()
{
local
param
=
"
$1
"
local
canaryDomains canary_domains_icloud canary_domains_mozilla
local
dnsmasq_config_update force_dns force_dns_port
local
procd_fw_src_interfaces
local
port
=
5053
output
"Starting
$serviceName
instances "
output
"Starting
$serviceName
instances
${
param
:+
$param
}
"
config_load
"
$packageName
"
config_get_bool canary_domains_icloud
'config'
'canary_domains_icloud'
'1'
config_get_bool canary_domains_mozilla
'config'
'canary_domains_mozilla'
'1'
...
...
@@ -239,7 +244,7 @@ start_service() {
fi
dhcp_backup
'create'
config_load
"
$packageName
"
config_foreach start_instance
"
$packageName
"
config_foreach start_instance
"
$packageName
"
"
$param
"
output
"
\\
n"
if
[
-n
"
$(
uci_changes dhcp
)
"
]
;
then
output
"Updating dnsmasq config "
...
...
@@ -248,6 +253,10 @@ start_service() {
else
output_failn
fi
param
=
'dnsmasq_restart'
fi
if
[
"
$param
"
=
'on_hotplug'
]
||
[
"
$param
"
=
'on_boot'
]
||
\
[
"
$param
"
=
'dnsmasq_restart'
]
;
then
output
"Restarting dnsmasq "
if
dnsmasq_restart
;
then
output_okn
...
...
@@ -258,10 +267,11 @@ start_service() {
}
stop_service
()
{
local
param
=
"
$1
"
local
canaryDomains canary_domains_icloud canary_domains_mozilla
local
dnsmasq_config_update
local
s
=
0
output
"Stopping
$serviceName
"
output
"Stopping
$serviceName
${
param
:+
$param
}
"
config_load
"
$packageName
"
config_get dnsmasq_config_update
'config'
'dnsmasq_config_update'
'*'
config_get_bool canary_domains_icloud
'config'
'canary_domains_icloud'
'1'
...
...
@@ -278,7 +288,7 @@ stop_service() {
dnsmasq_restart
||
s
=
1
fi
# shellcheck disable=SC2015
[
"
$s
"
-eq
0
]
&&
output_okn
||
output_failn
[
"
$s
"
=
'0'
]
&&
output_okn
||
output_failn
}
# shellcheck disable=SC1091
...
...
@@ -319,14 +329,16 @@ dnsmasq_doh_server() {
::
)
address
=
'::1'
;;
esac
uci_add_list_if_new
'dhcp'
"
$cfg
"
'server'
"
${
address
}
#
${
port
}
"
uci_add_list_if_new
'dhcp'
"
$cfg
"
'doh_server'
"
${
address
}
#
${
port
}
"
;;
remove
)
eval
"
$(
ubus call service list
"{ 'verbose': true, 'name': '
$packageName
' }"
| jsonfilter
-F
'# '
-e
'TUPLES=@[*].instances[*].command[4,6]'
)
"
for
i
in
$TUPLES
;
do
for
i
in
$(
uci
-q
get
"dhcp.
$cfg
.doh_server"
)
;
do
uci_remove_list
'dhcp'
"
$cfg
"
'server'
"
$i
"
uci_remove_list
'dhcp'
"
$cfg
"
'doh_server'
"
$i
"
done
for
i
in
$canaryDomains
;
do
uci_remove_list
'dhcp'
"
$cfg
"
'server'
"/
${
i
}
/"
uci_remove_list
'dhcp'
"
$cfg
"
'doh_server'
"/
${
i
}
/"
done
;;
esac
...
...
net/https-dns-proxy/files/
https-dns-proxy.defaults
→
net/https-dns-proxy/files/
etc/uci-defaults/50-https-dns-proxy-migrate-options.sh
浏览文件 @
f25b34fc
文件已移动
net/https-dns-proxy/files/https-dns-proxy.hotplug.iface
已删除
100644 → 0
浏览文件 @
49ea9e04
#!/bin/sh
if
[
"
$ACTION
"
=
'ifup'
]
&&
[
"
$INTERFACE
"
=
'wan'
]
&&
/etc/init.d/https-dns-proxy enabled
;
then
logger
-t
"https-dns-proxy"
"Restarting https-dns-proxy due to
$ACTION
of
$INTERFACE
"
/etc/init.d/https-dns-proxy restart
fi
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录