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

Add format config support

Browse source
This commit is contained in:
世界 2022-07-03 03:42:57 +08:00
parent 30444057bd
commit 85a695caa1
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
10 changed files with 77 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
option/route.go
View file

@ -26,8 +26,8 @@ type GeoIPOptions struct {
type _Rule struct {
Type string `json:"type,omitempty"`
DefaultOptions *DefaultRule `json:"default_options,omitempty"`
LogicalOptions *LogicalRule `json:"logical_options,omitempty"`
DefaultOptions *DefaultRule `json:"-"`
LogicalOptions *LogicalRule `json:"-"`
}
type Rule _Rule
@ -38,7 +38,7 @@ func (r Rule) Equals(other Rule) bool {
common.PtrEquals(r.LogicalOptions, other.LogicalOptions)
}
func (r *Rule) MarshalJSON() ([]byte, error) {
func (r Rule) MarshalJSON() ([]byte, error) {
var v any
switch r.Type {
case C.RuleTypeDefault:
@ -48,7 +48,7 @@ func (r *Rule) MarshalJSON() ([]byte, error) {
default:
return nil, E.New("unknown rule type: " + r.Type)
}
return MarshallObjects(r, v)
return MarshallObjects((_Rule)(r), v)
}
func (r *Rule) UnmarshalJSON(bytes []byte) error {