lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-25 21:36:13 -04:00
Code Issues Releases Wiki Activity

bytes to number methods

Browse Source
This commit is contained in:
v2ray 2016-01-24 22:28:44 +01:00
parent 96f582da98
commit 2b1441b030
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/net/port.go
View File

@ -7,7 +7,7 @@ import (
type Port serial.Uint16Literal
func PortFromBytes(port []byte) Port {
return Port(serial.ParseUint16(port))
return Port(serial.BytesLiteral(port).Uint16Value())
}
func (this Port) Value() uint16 {

18
common/serial/bytes.go
View File

@ -10,6 +10,24 @@ func (this BytesLiteral) Value() []byte {
return []byte(this)
}
func (this BytesLiteral) Uint8Value() uint8 {
return this.Value()[0]
}
func (this BytesLiteral) Uint16() Uint16Literal {
return Uint16Literal(this.Uint16Value())
}
func (this BytesLiteral) Uint16Value() uint16 {
value := this.Value()
return uint16(value[0])<<8 + uint16(value[1])
}
func (this BytesLiteral) IntValue() int {
value := this.Value()
return int(value[0])<<24 + int(value[1])<<16 + int(value[2])<<8 + int(value[3])
}
func (this BytesLiteral) Uint32Value() uint32 {
value := this.Value()
return uint32(value[0])<<24 +

11
common/serial/numbers.go
View File

@ -10,17 +10,6 @@ type Uint16 interface {
type Uint16Literal uint16
func ParseUint16(data []byte) Uint16Literal {
switch len(data) {
case 0:
return Uint16Literal(0)
case 1:
return Uint16Literal(uint16(data[0]))
default:
return Uint16Literal(uint16(data[0])<<8 + uint16(data[1]))
}
}
func (this Uint16Literal) String() string {
return strconv.Itoa(int(this))
}

2
proxy/vmess/command/accounts.go
View File

@ -78,7 +78,7 @@ func (this *SwitchAccount) Unmarshal(data []byte) error {
if len(data) < alterIdStart+2 {
return transport.CorruptedPacket
}
this.AlterIds = serial.ParseUint16(data[alterIdStart : alterIdStart+2])
this.AlterIds = serial.BytesLiteral(data[alterIdStart : alterIdStart+2]).Uint16()
levelStart := alterIdStart + 2
if len(data) < levelStart+1 {
return transport.CorruptedPacket