mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-05-10 06:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use capsulate protocol for large UDP packet

Browse source 
- make datagram transport without mux functionality
- it is now recommended to always pair with mux-cool (XUDP new tunnel non-zero session id)
This commit is contained in:
yuhan6665 2025-03-02 23:53:33 -05:00
parent 358bdc258e
commit 129b2be9c1
4 changed files with 140 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

67
transport/internet/quic/dialer.go
View file

@ -2,38 +2,18 @@ package quic
import (
"context"
"sync"
"time"
"github.com/quic-go/quic-go"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/signal/done"
"github.com/xtls/xray-core/transport/internet"
"github.com/xtls/xray-core/transport/internet/stat"
"github.com/xtls/xray-core/transport/internet/tls"
)
type connectionContext struct {
rawConn *net.UDPConn
conn quic.Connection
}
type clientConnections struct {
access sync.Mutex
conns map[net.Destination][]*connectionContext
// cleanup *task.Periodic
}
func isActive(s quic.Connection) bool {
select {
case <-s.Context().Done():
return false
default:
return true
}
}
func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (stat.Connection, error) {
tlsConfig := tls.ConfigFromStreamSettings(streamSettings)
if tlsConfig == nil {
@ -68,38 +48,11 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
config := streamSettings.ProtocolSettings.(*Config)
return client.openConnection(ctx, destAddr, config, tlsConfig, streamSettings.SocketSettings)
return openConnection(ctx, destAddr, config, tlsConfig, streamSettings.SocketSettings)
}
func (s *clientConnections) openConnection(ctx context.Context, destAddr net.Addr, config *Config, tlsConfig *tls.Config, sockopt *internet.SocketConfig) (stat.Connection, error) {
s.access.Lock()
defer s.access.Unlock()
if s.conns == nil {
s.conns = make(map[net.Destination][]*connectionContext)
}
func openConnection(ctx context.Context, destAddr net.Addr, config *Config, tlsConfig *tls.Config, sockopt *internet.SocketConfig) (stat.Connection, error) {
dest := net.DestinationFromAddr(destAddr)
var conns []*connectionContext
if s, found := s.conns[dest]; found {
conns = s
}
if len(conns) > 0 {
s := conns[len(conns)-1]
if isActive(s.conn) {
return &interConn{
ctx: ctx,
quicConn: s.conn,
local: s.conn.LocalAddr(),
remote: destAddr,
}, nil
} else {
errors.LogInfo(ctx, "current quic connection is not active!")
}
}
errors.LogInfo(ctx, "dialing quic to ", dest)
rawConn, err := internet.DialSystem(ctx, dest, sockopt)
if err != nil {
@ -134,21 +87,9 @@ func (s *clientConnections) openConnection(ctx context.Context, destAddr net.Add
return nil, err
}
context := &connectionContext{
conn: conn,
rawConn: udpConn,
}
s.conns[dest] = append(conns, context)
return &interConn{
ctx: ctx,
quicConn: context.conn,
local: context.conn.LocalAddr(),
remote: destAddr,
}, nil
return NewConnInitReader(ctx, conn, done.New(), destAddr), nil
}
var client clientConnections
func init() {
common.Must(internet.RegisterTransportDialer(protocolName, Dial))
}