|
|
@@ -6,6 +6,7 @@ import (
|
|
|
|
|
|
"github.com/sagernet/sing-box/adapter"
|
|
|
"github.com/sagernet/sing-box/common/dialer"
|
|
|
+ "github.com/sagernet/sing-box/common/mux"
|
|
|
C "github.com/sagernet/sing-box/constant"
|
|
|
"github.com/sagernet/sing-box/log"
|
|
|
"github.com/sagernet/sing-box/option"
|
|
|
@@ -20,12 +21,13 @@ var _ adapter.Outbound = (*VMess)(nil)
|
|
|
|
|
|
type VMess struct {
|
|
|
myOutboundAdapter
|
|
|
- dialer N.Dialer
|
|
|
- client *vmess.Client
|
|
|
- serverAddr M.Socksaddr
|
|
|
+ dialer N.Dialer
|
|
|
+ client *vmess.Client
|
|
|
+ serverAddr M.Socksaddr
|
|
|
+ multiplexDialer N.Dialer
|
|
|
}
|
|
|
|
|
|
-func NewVMess(router adapter.Router, logger log.ContextLogger, tag string, options option.VMessOutboundOptions) (*VMess, error) {
|
|
|
+func NewVMess(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.VMessOutboundOptions) (*VMess, error) {
|
|
|
var clientOptions []vmess.ClientOption
|
|
|
if options.GlobalPadding {
|
|
|
clientOptions = append(clientOptions, vmess.ClientWithGlobalPadding())
|
|
|
@@ -37,38 +39,80 @@ func NewVMess(router adapter.Router, logger log.ContextLogger, tag string, optio
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
- detour, err := dialer.NewTLS(dialer.NewOutbound(router, options.OutboundDialerOptions), options.Server, common.PtrValueOrDefault(options.TLSOptions))
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- return &VMess{
|
|
|
- myOutboundAdapter{
|
|
|
+ inbound := &VMess{
|
|
|
+ myOutboundAdapter: myOutboundAdapter{
|
|
|
protocol: C.TypeVMess,
|
|
|
network: options.Network.Build(),
|
|
|
router: router,
|
|
|
logger: logger,
|
|
|
tag: tag,
|
|
|
},
|
|
|
- detour,
|
|
|
- client,
|
|
|
- options.ServerOptions.Build(),
|
|
|
- }, nil
|
|
|
+ client: client,
|
|
|
+ serverAddr: options.ServerOptions.Build(),
|
|
|
+ }
|
|
|
+ inbound.dialer, err = dialer.NewTLS(dialer.NewOutbound(router, options.OutboundDialerOptions), options.Server, common.PtrValueOrDefault(options.TLSOptions))
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ inbound.multiplexDialer, err = mux.NewClientWithOptions(ctx, (*vmessDialer)(inbound), common.PtrValueOrDefault(options.MultiplexOptions))
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ return inbound, nil
|
|
|
}
|
|
|
|
|
|
func (h *VMess) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
|
|
|
+ if h.multiplexDialer == nil {
|
|
|
+ switch N.NetworkName(network) {
|
|
|
+ case N.NetworkTCP:
|
|
|
+ h.logger.InfoContext(ctx, "outbound connection to ", destination)
|
|
|
+ case N.NetworkUDP:
|
|
|
+ h.logger.InfoContext(ctx, "outbound packet connection to ", destination)
|
|
|
+ }
|
|
|
+ return (*vmessDialer)(h).DialContext(ctx, network, destination)
|
|
|
+ } else {
|
|
|
+ switch N.NetworkName(network) {
|
|
|
+ case N.NetworkTCP:
|
|
|
+ h.logger.InfoContext(ctx, "outbound multiplex connection to ", destination)
|
|
|
+ case N.NetworkUDP:
|
|
|
+ h.logger.InfoContext(ctx, "outbound multiplex packet connection to ", destination)
|
|
|
+ }
|
|
|
+ return h.multiplexDialer.DialContext(ctx, network, destination)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (h *VMess) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
|
|
|
+ if h.multiplexDialer == nil {
|
|
|
+ h.logger.InfoContext(ctx, "outbound packet connection to ", destination)
|
|
|
+ return (*vmessDialer)(h).ListenPacket(ctx, destination)
|
|
|
+ } else {
|
|
|
+ h.logger.InfoContext(ctx, "outbound multiplex packet connection to ", destination)
|
|
|
+ return h.multiplexDialer.ListenPacket(ctx, destination)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (h *VMess) NewConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
|
|
|
+ return NewEarlyConnection(ctx, h, conn, metadata)
|
|
|
+}
|
|
|
+
|
|
|
+func (h *VMess) NewPacketConnection(ctx context.Context, conn N.PacketConn, metadata adapter.InboundContext) error {
|
|
|
+ return NewPacketConnection(ctx, h, conn, metadata)
|
|
|
+}
|
|
|
+
|
|
|
+type vmessDialer VMess
|
|
|
+
|
|
|
+func (h *vmessDialer) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
|
|
|
ctx, metadata := adapter.AppendContext(ctx)
|
|
|
metadata.Outbound = h.tag
|
|
|
metadata.Destination = destination
|
|
|
switch N.NetworkName(network) {
|
|
|
case N.NetworkTCP:
|
|
|
- h.logger.InfoContext(ctx, "outbound connection to ", destination)
|
|
|
outConn, err := h.dialer.DialContext(ctx, N.NetworkTCP, h.serverAddr)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
return h.client.DialEarlyConn(outConn, destination), nil
|
|
|
case N.NetworkUDP:
|
|
|
- h.logger.InfoContext(ctx, "outbound packet connection to ", destination)
|
|
|
outConn, err := h.dialer.DialContext(ctx, N.NetworkTCP, h.serverAddr)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
@@ -79,18 +123,10 @@ func (h *VMess) DialContext(ctx context.Context, network string, destination M.S
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func (h *VMess) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
|
|
|
+func (h *vmessDialer) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
|
|
|
conn, err := h.DialContext(ctx, N.NetworkUDP, destination)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
return conn.(vmess.PacketConn), nil
|
|
|
}
|
|
|
-
|
|
|
-func (h *VMess) NewConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
|
|
|
- return NewEarlyConnection(ctx, h, conn, metadata)
|
|
|
-}
|
|
|
-
|
|
|
-func (h *VMess) NewPacketConnection(ctx context.Context, conn N.PacketConn, metadata adapter.InboundContext) error {
|
|
|
- return NewPacketConnection(ctx, h, conn, metadata)
|
|
|
-}
|
世界