purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-25 06:36:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

SplitHTTP Config: Add capability to parse int in string format (#3855)

Browse Source 
“100” → 100
“-1” → -1
“” → 0
This commit is contained in:
风扇滑翔翼 2024-09-29 03:10:42 +08:00 committed by GitHub
parent d8485bd5af
commit 697156f6f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
infra/conf/common.go
View File

@ -252,10 +252,23 @@ type Int32Range struct {
} }
func (v *Int32Range) UnmarshalJSON(data []byte) error { func (v *Int32Range) UnmarshalJSON(data []byte) error {
var stringrange string var str string
var rawint int32 var rawint int32
if err := json.Unmarshal(data, &stringrange); err == nil { if err := json.Unmarshal(data, &str); err == nil {
pair := strings.SplitN(stringrange, "-", 2) // for number in string format like "114" or "-1"
if value, err := strconv.Atoi(str); err == nil {
v.From = int32(value)
v.To = int32(value)
return nil
}
// for empty "", we treat it as 0
if str == "" {
v.From = 0
v.To = 0
return nil
}
// for range value, like "114-514"
pair := strings.SplitN(str, "-", 2)
if len(pair) == 2 { if len(pair) == 2 {
from, err := strconv.Atoi(pair[0]) from, err := strconv.Atoi(pair[0])
to, err2 := strconv.Atoi(pair[1]) to, err2 := strconv.Atoi(pair[1])