lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-18 03:29:12 -04:00
Code Issues Releases Wiki Activity

VLESS XTLS ReadV

Browse Source
This commit is contained in:
RPRX
2020-11-03 14:32:17 +00:00
committed by GitHub
parent fe0284a85a
commit e8361016ae
5 changed files with 75 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
proxy/vless/encoding/encoding.go
View File

@@ -5,12 +5,17 @@ package encoding
//go:generate go run v2ray.com/core/common/errors/errorgen
import (
"fmt"
"io"
"syscall"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol"
"v2ray.com/core/common/signal"
"v2ray.com/core/proxy/vless"
"v2ray.com/core/transport/internet/xtls"
)
const (
@@ -167,3 +172,31 @@ func DecodeResponseHeader(reader io.Reader, request *protocol.RequestHeader) (*A
return responseAddons, nil
}
func ReadV(reader buf.Reader, writer buf.Writer, timer signal.ActivityUpdater, conn *xtls.Conn, rawConn syscall.RawConn) error {
err := func() error {
for {
if conn.DirectIn {
conn.DirectIn = false
reader = buf.NewReadVReader(conn.Connection, rawConn)
if conn.SHOW {
fmt.Println(conn.MARK, "ReadV")
}
}
buffer, err := reader.ReadMultiBuffer()
if !buffer.IsEmpty() {
timer.Update()
if werr := writer.WriteMultiBuffer(buffer); werr != nil {
return werr
}
}
if err != nil {
return err
}
}
}()
if err != nil && errors.Cause(err) != io.EOF {
return err
}
return nil
}

18
proxy/vless/inbound/inbound.go
View File

@@ -8,6 +8,7 @@ import (
"context"
"io"
"strconv"
"syscall"
"time"
"v2ray.com/core"
@@ -372,6 +373,8 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
// Flow: requestAddons.Flow,
}
var rawConn syscall.RawConn
switch requestAddons.Flow {
case vless.XRO, vless.XRD:
if account.Flow == requestAddons.Flow {
@@ -387,6 +390,9 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
xtlsConn.MARK = "XTLS"
if requestAddons.Flow == vless.XRD {
xtlsConn.DirectMode = true
if sc, ok := xtlsConn.Connection.(syscall.Conn); ok {
rawConn, _ = sc.SyscallConn()
}
}
} else {
return newError(`failed to use ` + requestAddons.Flow + `, maybe "security" is not "xtls"`).AtWarning()
@@ -429,8 +435,16 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
// default: clientReader := reader
clientReader := encoding.DecodeBodyAddons(reader, request, requestAddons)
// from clientReader.ReadMultiBuffer to serverWriter.WriteMultiBufer
if err := buf.Copy(clientReader, serverWriter, buf.UpdateActivity(timer)); err != nil {
var err error
if rawConn != nil {
err = encoding.ReadV(clientReader, serverWriter, timer, iConn.(*xtls.Conn), rawConn)
} else {
// from clientReader.ReadMultiBuffer to serverWriter.WriteMultiBufer
err = buf.Copy(clientReader, serverWriter, buf.UpdateActivity(timer))
}
if err != nil {
return newError("failed to transfer request payload").Base(err).AtInfo()
}

16
proxy/vless/outbound/outbound.go
View File

@@ -6,6 +6,7 @@ package outbound
import (
"context"
"syscall"
"time"
"v2ray.com/core"
@@ -124,6 +125,8 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
Flow: account.Flow,
}
var rawConn syscall.RawConn
allowUDP443 := false
switch requestAddons.Flow {
case vless.XRO + "-udp443", vless.XRD + "-udp443":
@@ -146,6 +149,9 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
xtlsConn.MARK = "XTLS"
if requestAddons.Flow == vless.XRD {
xtlsConn.DirectMode = true
if sc, ok := xtlsConn.Connection.(syscall.Conn); ok {
rawConn, _ = sc.SyscallConn()
}
}
} else {
return newError(`failed to use ` + requestAddons.Flow + `, maybe "security" is not "xtls"`).AtWarning()
@@ -206,8 +212,14 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
// default: serverReader := buf.NewReader(conn)
serverReader := encoding.DecodeBodyAddons(conn, request, responseAddons)
// from serverReader.ReadMultiBuffer to clientWriter.WriteMultiBufer
if err := buf.Copy(serverReader, clientWriter, buf.UpdateActivity(timer)); err != nil {
if rawConn != nil {
err = encoding.ReadV(serverReader, clientWriter, timer, iConn.(*xtls.Conn), rawConn)
} else {
// from serverReader.ReadMultiBuffer to clientWriter.WriteMultiBufer
err = buf.Copy(serverReader, clientWriter, buf.UpdateActivity(timer))
}
if err != nil {
return newError("failed to transfer response payload").Base(err).AtInfo()
}