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

Move predefined DNS server to rule action

Browse source
This commit is contained in:
世界 2025-02-26 08:59:21 +08:00
parent de9ceb82bb
commit 4f902b8507
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
15 changed files with 289 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

12
option/rule_action.go
View file

@ -92,6 +92,7 @@ type _DNSRuleAction struct {
RouteOptions DNSRouteActionOptions `json:"-"`
RouteOptionsOptions DNSRouteOptionsActionOptions `json:"-"`
RejectOptions RejectActionOptions `json:"-"`
PredefinedOptions DNSRouteActionPredefined `json:"-"`
}
type DNSRuleAction _DNSRuleAction
@ -109,6 +110,8 @@ func (r DNSRuleAction) MarshalJSON() ([]byte, error) {
v = r.RouteOptionsOptions
case C.RuleActionTypeReject:
v = r.RejectOptions
case C.RuleActionTypePredefined:
v = r.PredefinedOptions
default:
return nil, E.New("unknown DNS rule action: " + r.Action)
}
@ -129,6 +132,8 @@ func (r *DNSRuleAction) UnmarshalJSONContext(ctx context.Context, data []byte) e
v = &r.RouteOptionsOptions
case C.RuleActionTypeReject:
v = &r.RejectOptions
case C.RuleActionTypePredefined:
v = &r.PredefinedOptions
default:
return E.New("unknown DNS rule action: " + r.Action)
}
@ -294,3 +299,10 @@ type RouteActionResolve struct {
RewriteTTL *uint32 `json:"rewrite_ttl,omitempty"`
ClientSubnet *badoption.Prefixable `json:"client_subnet,omitempty"`
}
type DNSRouteActionPredefined struct {
Rcode *DNSRCode `json:"rcode,omitempty"`
Answer badoption.Listable[DNSRecordOptions] `json:"answer,omitempty"`
Ns badoption.Listable[DNSRecordOptions] `json:"ns,omitempty"`
Extra badoption.Listable[DNSRecordOptions] `json:"extra,omitempty"`
}