From 50957b997367376b293b70d63c517480fe5eea24 Mon Sep 17 00:00:00 2001 From: v2ray Date: Mon, 23 May 2016 20:25:24 +0200 Subject: [PATCH] Fix build break --- app/router/rules/config_json.go | 10 +++++----- common/net/network_json.go | 2 +- proxy/freedom/config_json.go | 2 +- proxy/shadowsocks/config_json.go | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/router/rules/config_json.go b/app/router/rules/config_json.go index c87c388c..f7a3669e 100644 --- a/app/router/rules/config_json.go +++ b/app/router/rules/config_json.go @@ -21,10 +21,10 @@ type JsonRule struct { func parseFieldRule(msg json.RawMessage) (*Rule, error) { type RawFieldRule struct { JsonRule - Domain *serial.StringLiteralList `json:"domain"` - IP *serial.StringLiteralList `json:"ip"` - Port *v2net.PortRange `json:"port"` - Network *v2net.NetworkList `json:"network"` + Domain *serial.StringTList `json:"domain"` + IP *serial.StringTList `json:"ip"` + Port *v2net.PortRange `json:"port"` + Network *v2net.NetworkList `json:"network"` } rawFieldRule := new(RawFieldRule) err := json.Unmarshal(msg, rawFieldRule) @@ -128,7 +128,7 @@ func init() { Rules: make([]*Rule, len(jsonConfig.RuleList)), DomainStrategy: DomainAsIs, } - domainStrategy := serial.StringLiteral(jsonConfig.DomainStrategy).ToLower() + domainStrategy := serial.StringT(jsonConfig.DomainStrategy).ToLower() if domainStrategy.String() == "alwaysip" { config.DomainStrategy = AlwaysUseIP } else if domainStrategy.String() == "ipifnonmatch" { diff --git a/common/net/network_json.go b/common/net/network_json.go index 84673160..0779f1b7 100644 --- a/common/net/network_json.go +++ b/common/net/network_json.go @@ -9,7 +9,7 @@ import ( ) func (this *NetworkList) UnmarshalJSON(data []byte) error { - var strlist serial.StringLiteralList + var strlist serial.StringTList if err := json.Unmarshal(data, &strlist); err != nil { return err } diff --git a/proxy/freedom/config_json.go b/proxy/freedom/config_json.go index 5ce1cc71..8e9465ed 100644 --- a/proxy/freedom/config_json.go +++ b/proxy/freedom/config_json.go @@ -18,7 +18,7 @@ func (this *Config) UnmarshalJSON(data []byte) error { return err } this.DomainStrategy = DomainStrategyAsIs - domainStrategy := serial.StringLiteral(jsonConfig.DomainStrategy).ToLower() + domainStrategy := serial.StringT(jsonConfig.DomainStrategy).ToLower() if domainStrategy.String() == "useip" { this.DomainStrategy = DomainStrategyUseIP } diff --git a/proxy/shadowsocks/config_json.go b/proxy/shadowsocks/config_json.go index 595ada8a..f31178dd 100644 --- a/proxy/shadowsocks/config_json.go +++ b/proxy/shadowsocks/config_json.go @@ -14,11 +14,11 @@ import ( func (this *Config) UnmarshalJSON(data []byte) error { type JsonConfig struct { - Cipher serial.StringLiteral `json:"method"` - Password serial.StringLiteral `json:"password"` - UDP bool `json:"udp"` - Level byte `json:"level"` - Email string `json:"email"` + Cipher serial.StringT `json:"method"` + Password serial.StringT `json:"password"` + UDP bool `json:"udp"` + Level byte `json:"level"` + Email string `json:"email"` } jsonConfig := new(JsonConfig) if err := json.Unmarshal(data, jsonConfig); err != nil {