lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-08-22 23:05:22 -04:00
Code Issues Releases Wiki Activity

update error messages

Browse Source
This commit is contained in:
Darien Raymond
2017-04-07 22:56:27 +02:00
parent 9bb66b4de4
commit a034276eee
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/vmess/encoding/commands.go
+7 -7
View File
@@ -110,38 +110,38 @@ func (v *CommandSwitchAccountFactory) Marshal(command interface{}, writer io.Wri
func (v *CommandSwitchAccountFactory) Unmarshal(data []byte) (interface{}, error) {
cmd := new(protocol.CommandSwitchAccount)
if len(data) == 0 {
return nil, errors.New("VMess|SwitchAccountCommand: Insufficient length.")
return nil, errors.New("insufficient length.").Path("Proxy", "VMess", "Encoding", "Command")
}
lenHost := int(data[0])
if len(data) < lenHost+1 {
return nil, errors.New("VMess|SwitchAccountCommand: Insufficient length.")
return nil, errors.New("insufficient length.").Path("Proxy", "VMess", "Encoding", "Command")
}
if lenHost > 0 {
cmd.Host = net.ParseAddress(string(data[1 : 1+lenHost]))
}
portStart := 1 + lenHost
if len(data) < portStart+2 {
return nil, errors.New("VMess|SwitchAccountCommand: Insufficient length.")
return nil, errors.New("insufficient length.").Path("Proxy", "VMess", "Encoding", "Command")
}
cmd.Port = net.PortFromBytes(data[portStart : portStart+2])
idStart := portStart + 2
if len(data) < idStart+16 {
return nil, errors.New("VMess|SwitchAccountCommand: Insufficient length.")
return nil, errors.New("insufficient length.").Path("Proxy", "VMess", "Encoding", "Command")
}
cmd.ID, _ = uuid.ParseBytes(data[idStart : idStart+16])
alterIDStart := idStart + 16
if len(data) < alterIDStart+2 {
return nil, errors.New("VMess|SwitchAccountCommand: Insufficient length.")
return nil, errors.New("insufficient length.").Path("Proxy", "VMess", "Encoding", "Command")
}
cmd.AlterIds = serial.BytesToUint16(data[alterIDStart : alterIDStart+2])
levelStart := alterIDStart + 2
if len(data) < levelStart+1 {
return nil, errors.New("VMess|SwitchAccountCommand: Insufficient length.")
return nil, errors.New("insufficient length.").Path("Proxy", "VMess", "Encoding", "Command")
}
cmd.Level = uint32(data[levelStart])
timeStart := levelStart + 1
if len(data) < timeStart {
return nil, errors.New("VMess|SwitchAccountCommand: Insufficient length.")
return nil, errors.New("insufficient length.").Path("Proxy", "VMess", "Encoding", "Command")
}
cmd.ValidMin = data[timeStart]
return cmd, nil