chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
世界 2023-10-08 11:42:59 +08:00
parent 0c47e2c0c2
commit 2d598e34ea
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
option/types.go
View File

@ -2,7 +2,6 @@ package option
import ( import (
"net/netip" "net/netip"
"strings"
"time" "time"
"github.com/sagernet/sing-box/common/json" "github.com/sagernet/sing-box/common/json"
@ -50,10 +49,13 @@ func (a *ListenAddress) Build() netip.Addr {
return (netip.Addr)(*a) return (netip.Addr)(*a)
} }
type NetworkList string type NetworkList []string
func (v *NetworkList) UnmarshalJSON(content []byte) (err error) { func (v *NetworkList) UnmarshalJSON(content []byte) error {
var networkList []string var (
networkList []string
err error
)
if len(content) > 0 && content[0] != '[' { if len(content) > 0 && content[0] != '[' {
networkList = make([]string, 1) networkList = make([]string, 1)
err = json.Unmarshal(content, &networkList[0]) err = json.Unmarshal(content, &networkList[0])
@ -61,25 +63,25 @@ func (v *NetworkList) UnmarshalJSON(content []byte) (err error) {
err = json.Unmarshal(content, &networkList) err = json.Unmarshal(content, &networkList)
} }
if err != nil { if err != nil {
return return err
} }
for _, networkName := range networkList { for _, networkName := range networkList {
switch networkName { switch networkName {
case N.NetworkTCP, N.NetworkUDP: case N.NetworkTCP, N.NetworkUDP:
break break
default: default:
return E.New("unknown network: " + networkName) return E.Extend(N.ErrUnknownNetwork, networkName)
} }
} }
*v = NetworkList(strings.Join(networkList, "\n")) *v = networkList
return return nil
} }
func (v NetworkList) Build() []string { func (v NetworkList) Build() []string {
if v == "" { if len(v) == 0 {
return []string{N.NetworkTCP, N.NetworkUDP} return []string{N.NetworkTCP, N.NetworkUDP}
} }
return strings.Split(string(v), "\n") return v
} }
type Listable[T comparable] []T type Listable[T comparable] []T
@ -91,13 +93,14 @@ func (l Listable[T]) MarshalJSON() ([]byte, error) {
return json.Marshal([]T(l)) return json.Marshal([]T(l))
} }
func (l *Listable[T]) UnmarshalJSON(content []byte) (err error) { func (l *Listable[T]) UnmarshalJSON(content []byte) error {
if len(content) > 0 && content[0] != '[' { if len(content) > 0 && content[0] != '[' {
var element T var element T
if err = json.Unmarshal(content, &element); err == nil { err := json.Unmarshal(content, &element)
if err == nil {
*l = []T{element} *l = []T{element}
return nil
} }
return
} }
return json.Unmarshal(content, (*[]T)(l)) return json.Unmarshal(content, (*[]T)(l))
} }