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

Add rule-set merge command

Browse source
This commit is contained in:
世界 2024-12-16 12:01:42 +08:00
parent ff7aaf977b
commit 50b8f3ab94
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
5 changed files with 199 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
option/rule_set.go
View file

@ -194,8 +194,9 @@ func (r LogicalHeadlessRule) IsValid() bool {
}
type _PlainRuleSetCompat struct {
Version uint8 `json:"version"`
Options PlainRuleSet `json:"-"`
Version uint8 `json:"version"`
Options PlainRuleSet `json:"-"`
RawMessage json.RawMessage `json:"-"`
}
type PlainRuleSetCompat _PlainRuleSetCompat
@ -229,6 +230,7 @@ func (r *PlainRuleSetCompat) UnmarshalJSON(bytes []byte) error {
if err != nil {
return err
}
r.RawMessage = bytes
return nil
}