Austin/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-16 22:23:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix UVariantLen usage

Browse Source
This commit is contained in:
Hellojack 2023-04-26 05:22:17 +08:00 committed by 世界
parent 6f1b258501
commit ad999d4791
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
transport/vless/protocol.go
View File

@ -130,7 +130,7 @@ func WriteRequest(writer io.Writer, request Request, payload []byte) error {
var addonsLen int var addonsLen int
if request.Flow != "" { if request.Flow != "" {
addonsLen += 1 // protobuf header addonsLen += 1 // protobuf header
addonsLen += UvarintLen(uint64(len(request.Flow))) addonsLen += rw.UVariantLen(uint64(len(request.Flow)))
addonsLen += len(request.Flow) addonsLen += len(request.Flow)
requestLen += addonsLen requestLen += addonsLen
} }
@ -150,8 +150,8 @@ func WriteRequest(writer io.Writer, request Request, payload []byte) error {
) )
if addonsLen > 0 { if addonsLen > 0 {
common.Must(buffer.WriteByte(10)) common.Must(buffer.WriteByte(10))
binary.PutUvarint(buffer.Extend(UvarintLen(uint64(len(request.Flow)))), uint64(len(request.Flow))) binary.PutUvarint(buffer.Extend(rw.UVariantLen(uint64(len(request.Flow)))), uint64(len(request.Flow)))
common.Must(common.Error(buffer.Write([]byte(request.Flow)))) common.Must(common.Error(buffer.WriteString(request.Flow)))
} }
common.Must( common.Must(
buffer.WriteByte(request.Command), buffer.WriteByte(request.Command),
@ -174,7 +174,7 @@ func EncodeRequest(request Request, buffer *buf.Buffer) {
var addonsLen int var addonsLen int
if request.Flow != "" { if request.Flow != "" {
addonsLen += 1 // protobuf header addonsLen += 1 // protobuf header
addonsLen += UvarintLen(uint64(len(request.Flow))) addonsLen += rw.UVariantLen(uint64(len(request.Flow)))
addonsLen += len(request.Flow) addonsLen += len(request.Flow)
requestLen += addonsLen requestLen += addonsLen
} }
@ -189,8 +189,8 @@ func EncodeRequest(request Request, buffer *buf.Buffer) {
) )
if addonsLen > 0 { if addonsLen > 0 {
common.Must(buffer.WriteByte(10)) common.Must(buffer.WriteByte(10))
binary.PutUvarint(buffer.Extend(UvarintLen(uint64(len(request.Flow)))), uint64(len(request.Flow))) binary.PutUvarint(buffer.Extend(rw.UVariantLen(uint64(len(request.Flow)))), uint64(len(request.Flow)))
common.Must(common.Error(buffer.Write([]byte(request.Flow)))) common.Must(common.Error(buffer.WriteString(request.Flow)))
} }
common.Must( common.Must(
buffer.WriteByte(request.Command), buffer.WriteByte(request.Command),
@ -210,7 +210,7 @@ func RequestLen(request Request) int {
var addonsLen int var addonsLen int
if request.Flow != "" { if request.Flow != "" {
addonsLen += 1 // protobuf header addonsLen += 1 // protobuf header
addonsLen += UvarintLen(uint64(len(request.Flow))) addonsLen += rw.UVariantLen(uint64(len(request.Flow)))
addonsLen += len(request.Flow) addonsLen += len(request.Flow)
requestLen += addonsLen requestLen += addonsLen
} }
@ -229,7 +229,7 @@ func WritePacketRequest(writer io.Writer, request Request, payload []byte) error
var addonsLen int var addonsLen int
/*if request.Flow != "" { /*if request.Flow != "" {
addonsLen += 1 // protobuf header addonsLen += 1 // protobuf header
addonsLen += UvarintLen(uint64(len(request.Flow))) addonsLen += rw.UVariantLen(uint64(len(request.Flow)))
addonsLen += len(request.Flow) addonsLen += len(request.Flow)
requestLen += addonsLen requestLen += addonsLen
}*/ }*/
@ -251,8 +251,8 @@ func WritePacketRequest(writer io.Writer, request Request, payload []byte) error
if addonsLen > 0 { if addonsLen > 0 {
common.Must(buffer.WriteByte(10)) common.Must(buffer.WriteByte(10))
binary.PutUvarint(buffer.Extend(UvarintLen(uint64(len(request.Flow)))), uint64(len(request.Flow))) binary.PutUvarint(buffer.Extend(rw.UVariantLen(uint64(len(request.Flow)))), uint64(len(request.Flow)))
common.Must(common.Error(buffer.Write([]byte(request.Flow)))) common.Must(common.Error(buffer.WriteString(request.Flow)))
} }
common.Must( common.Must(
@ -290,8 +290,3 @@ func ReadResponse(reader io.Reader) error {
} }
return nil return nil
} }
func UvarintLen(value uint64) int {
var buffer [binary.MaxVarintLen64]byte
return binary.PutUvarint(buffer[:], value)
}