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

Fix parsing legacy DNS options

Browse source
This commit is contained in:
TargetLocked 2025-02-26 07:28:42 +08:00 • committed by 世界
parent 91107c91d1
commit bade63812b
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
option/dns.go
View file

@ -87,7 +87,7 @@ func (o *NewDNSServerOptions) UnmarshalJSONContext(ctx context.Context, content
} }
registry := service.FromContext[DNSTransportOptionsRegistry](ctx) registry := service.FromContext[DNSTransportOptionsRegistry](ctx)
if registry == nil { if registry == nil {
return E.New("missing outbound options registry in context") return E.New("missing DNS transport options registry in context")
} }
var options any var options any
switch o.Type { switch o.Type {
@ -102,7 +102,7 @@ func (o *NewDNSServerOptions) UnmarshalJSONContext(ctx context.Context, content
return E.New("unknown transport type: ", o.Type) return E.New("unknown transport type: ", o.Type)
} }
} }
err = badjson.UnmarshallExcludedContext(ctx, content, (*_Outbound)(o), options) err = badjson.UnmarshallExcludedContext(ctx, content, (*_NewDNSServerOptions)(o), options)
if err != nil { if err != nil {
return err return err
} }
@ -178,12 +178,10 @@ func (o *NewDNSServerOptions) Upgrade(ctx context.Context) error {
if !serverAddr.IsValid() { if !serverAddr.IsValid() {
return E.New("invalid server address") return E.New("invalid server address")
} }
remoteOptions.Server = serverAddr.Addr.String() remoteOptions.Server = serverAddr.AddrString()
if serverAddr.Port != 0 && serverAddr.Port != 53 { if serverAddr.Port != 0 && serverAddr.Port != 53 {
remoteOptions.ServerPort = serverAddr.Port remoteOptions.ServerPort = serverAddr.Port
} }
remoteOptions.Server = serverAddr.AddrString()
remoteOptions.ServerPort = serverAddr.Port
case C.DNSTypeTCP: case C.DNSTypeTCP:
o.Type = C.DNSTypeTCP o.Type = C.DNSTypeTCP
o.Options = &remoteOptions o.Options = &remoteOptions
@ -191,19 +189,17 @@ func (o *NewDNSServerOptions) Upgrade(ctx context.Context) error {
if !serverAddr.IsValid() { if !serverAddr.IsValid() {
return E.New("invalid server address") return E.New("invalid server address")
} }
remoteOptions.Server = serverAddr.Addr.String() remoteOptions.Server = serverAddr.AddrString()
if serverAddr.Port != 0 && serverAddr.Port != 53 { if serverAddr.Port != 0 && serverAddr.Port != 53 {
remoteOptions.ServerPort = serverAddr.Port remoteOptions.ServerPort = serverAddr.Port
} }
remoteOptions.Server = serverAddr.AddrString()
remoteOptions.ServerPort = serverAddr.Port
case C.DNSTypeTLS, C.DNSTypeQUIC: case C.DNSTypeTLS, C.DNSTypeQUIC:
o.Type = serverType o.Type = serverType
serverAddr := M.ParseSocksaddr(serverURL.Host) serverAddr := M.ParseSocksaddr(serverURL.Host)
if !serverAddr.IsValid() { if !serverAddr.IsValid() {
return E.New("invalid server address") return E.New("invalid server address")
} }
remoteOptions.Server = serverAddr.Addr.String() remoteOptions.Server = serverAddr.AddrString()
if serverAddr.Port != 0 && serverAddr.Port != 853 { if serverAddr.Port != 0 && serverAddr.Port != 853 {
remoteOptions.ServerPort = serverAddr.Port remoteOptions.ServerPort = serverAddr.Port
} }
@ -222,7 +218,7 @@ func (o *NewDNSServerOptions) Upgrade(ctx context.Context) error {
if !serverAddr.IsValid() { if !serverAddr.IsValid() {
return E.New("invalid server address") return E.New("invalid server address")
} }
httpsOptions.Server = serverAddr.Addr.String() httpsOptions.Server = serverAddr.AddrString()
if serverAddr.Port != 0 && serverAddr.Port != 443 { if serverAddr.Port != 0 && serverAddr.Port != 443 {
httpsOptions.ServerPort = serverAddr.Port httpsOptions.ServerPort = serverAddr.Port
} }