github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

add response op in vmess protocol

pull/55/head
V2Ray 2015-11-28 10:11:56 +01:00
parent 9a88e8696a
commit 3f0ada1bc8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/vmess/vmessin.go
View File

@ -101,7 +101,9 @@ func (this *VMessInboundHandler) HandleConnection(connection *net.TCPConn) error
// Optimize for small response packet // Optimize for small response packet
buffer := alloc.NewLargeBuffer().Clear() buffer := alloc.NewLargeBuffer().Clear()
buffer.Append(request.ResponseHeader) buffer.AppendBytes(request.ResponseHeader[0] | request.ResponseHeader[1])
buffer.AppendBytes(request.ResponseHeader[2] | request.ResponseHeader[3])
buffer.AppendBytes(byte(0), byte(0))
if data, open := <-output; open { if data, open := <-output; open {
buffer.Append(data.Value) buffer.Append(data.Value)

8
proxy/vmess/vmessout.go
View File

@ -1,7 +1,6 @@
package vmess package vmess
import ( import (
"bytes"
"crypto/md5" "crypto/md5"
"crypto/rand" "crypto/rand"
mrand "math/rand" mrand "math/rand"
@ -150,6 +149,11 @@ func handleRequest(conn net.Conn, request *protocol.VMessRequest, firstPacket v2
return return
} }
func headerMatch(request *protocol.VMessRequest, responseHeader []byte) bool {
return ((request.ResponseHeader[0] | request.ResponseHeader[1]) == responseHeader[0]) &&
((request.ResponseHeader[2] | request.ResponseHeader[3]) == responseHeader[1])
}
func handleResponse(conn net.Conn, request *protocol.VMessRequest, output chan<- *alloc.Buffer, finish *sync.Mutex, isUDP bool) { func handleResponse(conn net.Conn, request *protocol.VMessRequest, output chan<- *alloc.Buffer, finish *sync.Mutex, isUDP bool) {
defer finish.Unlock() defer finish.Unlock()
defer close(output) defer close(output)
@ -168,7 +172,7 @@ func handleResponse(conn net.Conn, request *protocol.VMessRequest, output chan<-
log.Error("VMessOut: Failed to read VMess response (%d bytes): %v", buffer.Len(), err) log.Error("VMessOut: Failed to read VMess response (%d bytes): %v", buffer.Len(), err)
return return
} }
if buffer.Len() < 4 || !bytes.Equal(buffer.Value[:4], request.ResponseHeader[:]) { if buffer.Len() < 4 || !headerMatch(request, buffer.Value[:2]) {
log.Warning("VMessOut: unexepcted response header. The connection is probably hijacked.") log.Warning("VMessOut: unexepcted response header. The connection is probably hijacked.")
return return
} }