github/v2ray-core
4
0
Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-11-01 16:18:24 +00:00
Code Issues Releases Wiki Activity

merge bad configuration error

Browse Source
This commit is contained in:
v2ray
2016-08-18 08:21:20 +02:00
parent 933e244d92
commit 39737f6fc1
10 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/socks/server_config_json.go
+2 -1
View File
@@ -6,6 +6,7 @@ import (
"encoding/json"
"errors"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy/registry"
@@ -35,7 +36,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
this.AuthType = AuthTypePassword
} else {
log.Error("Socks: Unknown auth method: ", rawConfig.AuthMethod)
return registry.ErrBadConfiguration
return common.ErrBadConfiguration
}
if len(rawConfig.Accounts) > 0 {