GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-09-02 06:31:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: transport & obfs refactoring

Browse Source
This commit is contained in:
Toby
2021-12-27 18:07:01 -08:00
parent e32191a967
commit 1c06b66cdc
13 changed files with 260 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/core/server.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/lunixbochs/struc"
"github.com/prometheus/client_golang/prometheus"
"github.com/tobyxdd/hysteria/pkg/acl"
"github.com/tobyxdd/hysteria/pkg/obfs"
transport2 "github.com/tobyxdd/hysteria/pkg/transport"
"net"
)
@@ -40,35 +41,11 @@ type Server struct {
func NewServer(addr string, protocol string, tlsConfig *tls.Config, quicConfig *quic.Config, transport transport2.Transport,
sendBPS uint64, recvBPS uint64, congestionFactory CongestionFactory, disableUDP bool, aclEngine *acl.Engine,
obfuscator Obfuscator, authFunc AuthFunc, tcpRequestFunc TCPRequestFunc, tcpErrorFunc TCPErrorFunc,
obfuscator obfs.Obfuscator, authFunc AuthFunc, tcpRequestFunc TCPRequestFunc, tcpErrorFunc TCPErrorFunc,
udpRequestFunc UDPRequestFunc, udpErrorFunc UDPErrorFunc, promRegistry *prometheus.Registry) (*Server, error) {
var pktConn net.PacketConn
if len(protocol) == 0 || protocol == "udp" {
udpAddr, err := transport.QUICResolveUDPAddr(addr)
if err != nil {
return nil, err
}
udpConn, err := transport.QUICListenUDP(udpAddr)
if err != nil {
return nil, err
}
if obfuscator != nil {
pktConn = newObfsUDPConn(udpConn, obfuscator)
} else {
pktConn = udpConn
}
} else if protocol == "faketcp" {
ftcpConn, err := transport.QUICListenFakeTCP(addr)
if err != nil {
return nil, err
}
if obfuscator != nil {
pktConn = newObfsFakeTCPConn(ftcpConn, obfuscator)
} else {
pktConn = ftcpConn
}
} else {
return nil, fmt.Errorf("unsupported protocol: %s", protocol)
pktConn, err := transport.QUICPacketConn(protocol, true, addr, "", obfuscator)
if err != nil {
return nil, err
}
listener, err := quic.Listen(pktConn, tlsConfig, quicConfig)
if err != nil {