yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-05-25 05:37:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve rule actions

Browse Source
This commit is contained in:
世界
2024-11-06 17:30:40 +08:00
parent 607f315f91
commit 2156b40f3a
10 changed files with 414 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
option/rule.go
View File

@@ -109,7 +109,7 @@ type DefaultRule struct {
RuleAction
}
func (r *DefaultRule) MarshalJSON() ([]byte, error) {
func (r DefaultRule) MarshalJSON() ([]byte, error) {
return badjson.MarshallObjects(r.RawDefaultRule, r.RuleAction)
}
@@ -128,27 +128,27 @@ func (r *DefaultRule) IsValid() bool {
return !reflect.DeepEqual(r, defaultValue)
}
type _LogicalRule struct {
type RawLogicalRule struct {
Mode string `json:"mode"`
Rules []Rule `json:"rules,omitempty"`
Invert bool `json:"invert,omitempty"`
}
type LogicalRule struct {
_LogicalRule
RawLogicalRule
RuleAction
}
func (r *LogicalRule) MarshalJSON() ([]byte, error) {
return badjson.MarshallObjects(r._LogicalRule, r.RuleAction)
func (r LogicalRule) MarshalJSON() ([]byte, error) {
return badjson.MarshallObjects(r.RawLogicalRule, r.RuleAction)
}
func (r *LogicalRule) UnmarshalJSON(data []byte) error {
err := json.Unmarshal(data, &r._LogicalRule)
err := json.Unmarshal(data, &r.RawLogicalRule)
if err != nil {
return err
}
return badjson.UnmarshallExcluded(data, &r._LogicalRule, &r.RuleAction)
return badjson.UnmarshallExcluded(data, &r.RawLogicalRule, &r.RuleAction)
}
func (r *LogicalRule) IsValid() bool {