mirror of
https://github.com/apernet/hysteria.git
synced 2025-04-03 20:47:38 +03:00
955a8a7470
this commit makes changes on the hysteria protocol, although old clients still be able to connect to a newer server, newer clients will fail if they connect to older servers and trying to submit a udp request, so the protocolVersion should be bumped if this commit finally get merged. this commit changes the way to handle hyClient.DialUDP(). in the past, the hysteria client asks the server to create the sessionID in every call to hyClient.DialUDP(), which requires a extra RTT to wait the server reply. to avoid this extra RTT, the hysteria client just generates and manages the sessionID by theirselves. the server checks the sessionID sent from clients in every udpMessage, and open & initiate a new udp session for every sessionID it not recognized. the way to release udp sessions is also changed in this commit, as every udp session no longer maintains a quic stream, now the client will open a dedicated quic stream to notify the server to release specified udp session. this also changes the behavior of "max_conn_client" in the server config. this commit can be a partial fix for #348, #352 and #414.
99 lines
1.9 KiB
Go
99 lines
1.9 KiB
Go
package core
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
const (
|
|
protocolVersion = uint8(3)
|
|
protocolVersionV2 = uint8(2)
|
|
protocolTimeout = 10 * time.Second
|
|
|
|
closeErrorCodeGeneric = 0
|
|
closeErrorCodeProtocol = 1
|
|
closeErrorCodeAuth = 2
|
|
)
|
|
|
|
type transmissionRate struct {
|
|
SendBPS uint64
|
|
RecvBPS uint64
|
|
}
|
|
|
|
type clientHello struct {
|
|
Rate transmissionRate
|
|
AuthLen uint16 `struc:"sizeof=Auth"`
|
|
Auth []byte
|
|
}
|
|
|
|
const (
|
|
serverHelloStatusFailed = uint8(0)
|
|
serverHelloStatusOK = uint8(1)
|
|
serverHelloStatusTCPOnly = uint8(2)
|
|
)
|
|
|
|
type serverHello struct {
|
|
Status uint8
|
|
Rate transmissionRate
|
|
MessageLen uint16 `struc:"sizeof=Message"`
|
|
Message string
|
|
}
|
|
|
|
const (
|
|
clientRequestTypeTCP = uint8(0)
|
|
clientRequestTypeUDPLegacy = uint8(1)
|
|
clientRequestTypeUDPControl = uint8(2)
|
|
)
|
|
|
|
type clientRequest struct {
|
|
Type uint8
|
|
HostLen uint16 `struc:"sizeof=Host"`
|
|
Host string
|
|
Port uint16
|
|
}
|
|
|
|
type serverResponse struct {
|
|
OK bool
|
|
UDPSessionID uint32
|
|
MessageLen uint16 `struc:"sizeof=Message"`
|
|
Message string
|
|
}
|
|
|
|
type udpMessage struct {
|
|
SessionID uint32
|
|
HostLen uint16 `struc:"sizeof=Host"`
|
|
Host string
|
|
Port uint16
|
|
MsgID uint16 // doesn't matter when not fragmented, but must not be 0 when fragmented
|
|
FragID uint8 // doesn't matter when not fragmented, starts at 0 when fragmented
|
|
FragCount uint8 // must be 1 when not fragmented
|
|
DataLen uint16 `struc:"sizeof=Data"`
|
|
Data []byte
|
|
}
|
|
|
|
func (m udpMessage) HeaderSize() int {
|
|
return 4 + 2 + len(m.Host) + 2 + 2 + 1 + 1 + 2
|
|
}
|
|
|
|
func (m udpMessage) Size() int {
|
|
return m.HeaderSize() + len(m.Data)
|
|
}
|
|
|
|
type udpMessageV2 struct {
|
|
SessionID uint32
|
|
HostLen uint16 `struc:"sizeof=Host"`
|
|
Host string
|
|
Port uint16
|
|
DataLen uint16 `struc:"sizeof=Data"`
|
|
Data []byte
|
|
}
|
|
|
|
const (
|
|
udpControlRequestOperationReleaseSession = uint8(1)
|
|
)
|
|
|
|
type udpControlRequest struct {
|
|
SessionID uint32
|
|
Operation uint8
|
|
DataLen uint16 `struc:"sizeof=Data"`
|
|
Data []byte
|
|
}
|