history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add ip-version param

Browse Source
This commit is contained in:
Skyxim
2022-08-28 13:41:19 +08:00
parent 42e489e199
commit 99effb051b
20 changed files with 398 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
transport/hysteria/transport/client.go
View File

@ -4,12 +4,10 @@ import (
"context"
"crypto/tls"
"fmt"
"github.com/Dreamacro/clash/component/resolver"
"github.com/Dreamacro/clash/transport/hysteria/conns/faketcp"
"github.com/Dreamacro/clash/transport/hysteria/conns/udp"
"github.com/Dreamacro/clash/transport/hysteria/conns/wechat"
"github.com/Dreamacro/clash/transport/hysteria/obfs"
"github.com/Dreamacro/clash/transport/hysteria/utils"
"github.com/lucas-clemente/quic-go"
"net"
)
@ -61,29 +59,21 @@ func (ct *ClientTransport) quicPacketConn(proto string, server string, obfs obfs
type PacketDialer interface {
ListenPacket() (net.PacketConn, error)
Context() context.Context
RemoteAddr(host string) (net.Addr, error)
}
func (ct *ClientTransport) QUICDial(proto string, server string, tlsConfig *tls.Config, quicConfig *quic.Config, obfs obfs.Obfuscator, dialer PacketDialer) (quic.Connection, error) {
ipStr, port, err := utils.SplitHostPort(server)
serverUDPAddr, err := dialer.RemoteAddr(server)
if err != nil {
return nil, err
}
ip, err := resolver.ResolveProxyServerHost(ipStr)
if err != nil {
return nil, err
}
serverUDPAddr := net.UDPAddr{
IP: net.ParseIP(ip.String()),
Port: int(port),
}
pktConn, err := ct.quicPacketConn(proto, serverUDPAddr.String(), obfs, dialer)
if err != nil {
return nil, err
}
qs, err := quic.DialContext(dialer.Context(), pktConn, &serverUDPAddr, server, tlsConfig, quicConfig)
qs, err := quic.DialContext(dialer.Context(), pktConn, serverUDPAddr, server, tlsConfig, quicConfig)
if err != nil {
_ = pktConn.Close()
return nil, err