lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-14 17:49:15 -04:00
Code Issues Releases Wiki Activity

use custom loading rules for router

Browse Source
This commit is contained in:
Shelikhoo
2021-09-09 14:45:19 +01:00
parent a8ff0a6371
commit 89d9eba1a9
4 changed files with 424 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
infra/conf/cfgcommon/common.go
View File

@@ -196,6 +196,17 @@ func (list *PortList) UnmarshalJSON(data []byte) error {
return newError("invalid port: ", string(data)).Base(err2)
}
}
err := list.UnmarshalText(listStr)
if err != nil {
return err
}
if number != 0 {
list.Range = append(list.Range, PortRange{From: number, To: number})
}
return nil
}
func (list *PortList) UnmarshalText(listStr string) error {
rangelist := strings.Split(listStr, ",")
for _, rangeStr := range rangelist {
trimmed := strings.TrimSpace(rangeStr)
@@ -215,9 +226,6 @@ func (list *PortList) UnmarshalJSON(data []byte) error {
}
}
}
if number != 0 {
list.Range = append(list.Range, PortRange{From: number, To: number})
}
return nil
}