lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-16 09:26:21 -05:00
Code Issues Releases Wiki Activity

Simplify vmess response

Browse Source
This commit is contained in:
V2Ray 2015-10-07 13:48:01 +02:00
parent 90f85a7272
commit b126c5ce2a
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proxy/vmess/protocol/vmess.go
View File

@ -209,15 +209,3 @@ func (request *VMessRequest) ToBytes(idHash user.CounterHash, randomRangeInt64 u
return buffer, nil
}
// VMessResponse is the header of a TCP response in VMess format.
type VMessResponse [4]byte
// NewVMessResponse creates a VMessResponse from a given VMessRequest.
func NewVMessResponse(request *VMessRequest) *VMessResponse {
return &VMessResponse{
request.ResponseHeader[0],
request.ResponseHeader[1],
request.ResponseHeader[2],
request.ResponseHeader[3]}
}

3
proxy/vmess/vmessin.go
View File

@ -90,7 +90,6 @@ func (handler *VMessInboundHandler) HandleConnection(connection net.Conn) error
responseKey := md5.Sum(request.RequestKey[:])
responseIV := md5.Sum(request.RequestIV[:])
response := protocol.NewVMessResponse(request)
responseWriter, err := v2io.NewAesEncryptWriter(responseKey[:], responseIV[:], connection)
if err != nil {
return log.Error("VMessIn: Failed to create encrypt writer: %v", err)
@ -98,7 +97,7 @@ func (handler *VMessInboundHandler) HandleConnection(connection net.Conn) error
// Optimize for small response packet
buffer := make([]byte, 0, 2*1024)
buffer = append(buffer, response[:]...)
buffer = append(buffer, request.ResponseHeader[:]...)
if data, open := <-output; open {
buffer = append(buffer, data...)

3
proxy/vmess/vmessin_udp.go
View File

@ -76,13 +76,12 @@ func (handler *VMessInboundHandler) handlePacket(conn *net.UDPConn, request *pro
buffer := bytes.NewBuffer(make([]byte, 0, bufferSize))
response := protocol.NewVMessResponse(request)
responseWriter, err := v2io.NewAesEncryptWriter(responseKey[:], responseIV[:], buffer)
if err != nil {
log.Error("VMessIn: Failed to create encrypt writer: %v", err)
return
}
responseWriter.Write(response[:])
responseWriter.Write(request.ResponseHeader[:])
hasData := false

2
proxy/vmess/vmessout.go
View File

@ -175,7 +175,7 @@ func handleResponse(conn net.Conn, request *protocol.VMessRequest, output chan<-
log.Error("VMessOut: Failed to read VMess response (%d bytes): %v", len(buffer), err)
return
}
if !bytes.Equal(buffer[:4], request.ResponseHeader[:]) {
if len(buffer) < 4 || !bytes.Equal(buffer[:4], request.ResponseHeader[:]) {
log.Warning("VMessOut: unexepcted response header. The connection is probably hijacked.")
return
}