mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-02 16:21:05 +00:00
rename CorruptedPacket to ErrorCorruptedPacket
This commit is contained in:
1 parent
1e79a3b75a
commit
383eb57487
11 files changed
+40
-40
No files matched your search
@@ -55,38 +55,38 @@ func (this *SwitchAccount) Marshal(writer io.Writer) {
|
||||
|
||||
func (this *SwitchAccount) Unmarshal(data []byte) error {
|
||||
if len(data) == 0 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
lenHost := int(data[0])
|
||||
if len(data) < lenHost+1 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
if lenHost > 0 {
|
||||
this.Host = v2net.ParseAddress(string(data[1 : 1+lenHost]))
|
||||
}
|
||||
portStart := 1 + lenHost
|
||||
if len(data) < portStart+2 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
this.Port = v2net.PortFromBytes(data[portStart : portStart+2])
|
||||
idStart := portStart + 2
|
||||
if len(data) < idStart+16 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
this.ID, _ = uuid.ParseBytes(data[idStart : idStart+16])
|
||||
alterIdStart := idStart + 16
|
||||
if len(data) < alterIdStart+2 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
this.AlterIds = serial.BytesLiteral(data[alterIdStart : alterIdStart+2]).Uint16()
|
||||
levelStart := alterIdStart + 2
|
||||
if len(data) < levelStart+1 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
this.Level = vmess.UserLevel(data[levelStart])
|
||||
timeStart := levelStart + 1
|
||||
if len(data) < timeStart {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
this.ValidMin = data[timeStart]
|
||||
return nil
|
||||
|
||||
@@ -40,14 +40,14 @@ func (this *CacheDns) Marshal(writer io.Writer) {
|
||||
|
||||
func (this *CacheDns) Unmarshal(data []byte) error {
|
||||
if len(data) == 0 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
typeIP := data[0]
|
||||
data = data[1:]
|
||||
|
||||
if typeIP == typeIPv4 {
|
||||
if len(data) < 4 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
this.Address = v2net.IPAddress(data[0:4])
|
||||
return nil
|
||||
@@ -55,11 +55,11 @@ func (this *CacheDns) Unmarshal(data []byte) error {
|
||||
|
||||
if typeIP == typeIPv6 {
|
||||
if len(data) < 16 {
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
this.Address = v2net.IPAddress(data[0:16])
|
||||
return nil
|
||||
}
|
||||
|
||||
return transport.CorruptedPacket
|
||||
return transport.ErrorCorruptedPacket
|
||||
}
|
||||
@@ -68,7 +68,7 @@ func parsePayload(data []byte) (payload []byte, rest []byte, err error) {
|
||||
actualHash := fnv1a.Sum32()
|
||||
expectedHash := uint32(data[2])<<24 + uint32(data[3])<<16 + uint32(data[4])<<8 + uint32(data[5])
|
||||
if actualHash != expectedHash {
|
||||
err = transport.CorruptedPacket
|
||||
err = transport.ErrorCorruptedPacket
|
||||
return
|
||||
}
|
||||
return
|
||||
|
||||
@@ -140,7 +140,7 @@ func (this *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
|
||||
}
|
||||
domainLength := int(buffer.Value[41])
|
||||
if domainLength == 0 {
|
||||
return nil, transport.CorruptedPacket
|
||||
return nil, transport.ErrorCorruptedPacket
|
||||
}
|
||||
nBytes, err = io.ReadFull(decryptor, buffer.Value[42:42+domainLength])
|
||||
if err != nil {
|
||||
@@ -164,7 +164,7 @@ func (this *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
|
||||
expectedHash := binary.BigEndian.Uint32(buffer.Value[bufferLen : bufferLen+4])
|
||||
|
||||
if actualHash != expectedHash {
|
||||
return nil, transport.CorruptedPacket
|
||||
return nil, transport.ErrorCorruptedPacket
|
||||
}
|
||||
|
||||
return request, nil
|
||||
|
||||
Reference in new issue
Block a user