Skip to content

Commit

Permalink
Transport: Add RAW as an alias of TCP (#3852)
Browse files Browse the repository at this point in the history
  • Loading branch information
RPRX authored Sep 28, 2024
1 parent 3632e83 commit d8485bd
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions infra/conf/transport_internet.go
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ type TransportProtocol string
// Build implements Buildable.
func (p TransportProtocol) Build() (string, error) {
switch strings.ToLower(string(p)) {
case "tcp":
case "raw", "tcp":
return "tcp", nil
case "kcp", "mkcp":
return "mkcp", nil
Expand Down Expand Up @@ -783,6 +783,7 @@ type StreamConfig struct {
Security string `json:"security"`
TLSSettings *TLSConfig `json:"tlsSettings"`
REALITYSettings *REALITYConfig `json:"realitySettings"`
RAWSettings *TCPConfig `json:"rawSettings"`
TCPSettings *TCPConfig `json:"tcpSettings"`
KCPSettings *KCPConfig `json:"kcpSettings"`
WSSettings *WebSocketConfig `json:"wsSettings"`
Expand Down Expand Up @@ -839,10 +840,13 @@ func (c *StreamConfig) Build() (*internet.StreamConfig, error) {
default:
return nil, errors.New(`Unknown security "` + c.Security + `".`)
}
if c.TCPSettings == nil {
c.TCPSettings = c.RAWSettings
}
if c.TCPSettings != nil {
ts, err := c.TCPSettings.Build()
if err != nil {
return nil, errors.New("Failed to build TCP config.").Base(err)
return nil, errors.New("Failed to build RAW config.").Base(err)
}
config.TransportSettings = append(config.TransportSettings, &internet.TransportConfig{
ProtocolName: "tcp",
Expand Down

0 comments on commit d8485bd

Please sign in to comment.