SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-04 04:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Deprecate dns_hijack and dns inbound

Browse source
This commit is contained in:
世界 2022-07-23 09:15:47 +08:00
parent 9f8978bbcf
commit 884c0cf595
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
18 changed files with 50 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

7
option/inbound.go
View file

@ -15,7 +15,6 @@ type _Inbound struct {
TunOptions TunInboundOptions `json:"-"`
RedirectOptions RedirectInboundOptions `json:"-"`
TProxyOptions TProxyInboundOptions `json:"-"`
DNSOptions DNSInboundOptions `json:"-"`
DirectOptions DirectInboundOptions `json:"-"`
SocksOptions SocksInboundOptions `json:"-"`
HTTPOptions HTTPMixedInboundOptions `json:"-"`
@ -32,7 +31,6 @@ func (h Inbound) Equals(other Inbound) bool {
h.TunOptions == other.TunOptions &&
h.RedirectOptions == other.RedirectOptions &&
h.TProxyOptions == other.TProxyOptions &&
h.DNSOptions == other.DNSOptions &&
h.DirectOptions == other.DirectOptions &&
h.SocksOptions.Equals(other.SocksOptions) &&
h.HTTPOptions.Equals(other.HTTPOptions) &&
@ -50,8 +48,6 @@ func (h Inbound) MarshalJSON() ([]byte, error) {
v = h.RedirectOptions
case C.TypeTProxy:
v = h.TProxyOptions
case C.TypeDNS:
v = h.DNSOptions
case C.TypeDirect:
v = h.DirectOptions
case C.TypeSocks:
@ -83,8 +79,6 @@ func (h *Inbound) UnmarshalJSON(bytes []byte) error {
v = &h.RedirectOptions
case C.TypeTProxy:
v = &h.TProxyOptions
case C.TypeDNS:
v = &h.DNSOptions
case C.TypeDirect:
v = &h.DirectOptions
case C.TypeSocks:
@ -200,7 +194,6 @@ type TunInboundOptions struct {
Inet4Address *ListenPrefix `json:"inet4_address,omitempty"`
Inet6Address *ListenPrefix `json:"inet6_address,omitempty"`
AutoRoute bool `json:"auto_route,omitempty"`
HijackDNS bool `json:"hijack_dns,omitempty"`
InboundOptions
}

4
option/outbound.go
View file

@ -40,7 +40,7 @@ func (h Outbound) MarshalJSON() ([]byte, error) {
switch h.Type {
case C.TypeDirect:
v = h.DirectOptions
case C.TypeBlock:
case C.TypeBlock, C.TypeDNS:
v = nil
case C.TypeSocks:
v = h.SocksOptions
@ -69,7 +69,7 @@ func (h *Outbound) UnmarshalJSON(bytes []byte) error {
switch h.Type {
case C.TypeDirect:
v = &h.DirectOptions
case C.TypeBlock:
case C.TypeBlock, C.TypeDNS:
v = nil
case C.TypeSocks:
v = &h.SocksOptions