Config: Prefer newer alias (REALITY target, RAW)

RPRX · RPRX · commit 98a517c56370 · 2024-10-18T01:17:20.000Z
diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
@@ -509,7 +509,7 @@ func (c *REALITYConfig) Build() (proto.Message, error) {
 	config.Show = c.Show
 	config.MasterKeyLog = c.MasterKeyLog
 	var err error
-	if c.Dest == nil {
+	if c.Target != nil {
 		c.Dest = c.Target
 	}
 	if c.Dest != nil {
@@ -856,7 +856,7 @@ func (c *StreamConfig) Build() (*internet.StreamConfig, error) {
 	default:
 		return nil, errors.New(`Unknown security "` + c.Security + `".`)
 	}
-	if c.TCPSettings == nil {
+	if c.RAWSettings != nil {
 		c.TCPSettings = c.RAWSettings
 	}
 	if c.TCPSettings != nil {

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ func (c *REALITYConfig) Build() (proto.Message, error) {`
`509`	`509`	`config.Show = c.Show`
`510`	`510`	`config.MasterKeyLog = c.MasterKeyLog`
`511`	`511`	`var err error`
`512`		`- if c.Dest == nil {`
	`512`	`+ if c.Target != nil {`
`513`	`513`	`c.Dest = c.Target`
`514`	`514`	`}`
`515`	`515`	`if c.Dest != nil {`
`@@ -856,7 +856,7 @@ func (c StreamConfig) Build() (internet.StreamConfig, error) {`
`856`	`856`	`default:`
`857`	`857`	return nil, errors.New(`Unknown security "` + c.Security + `".`)
`858`	`858`	`}`
`859`		`- if c.TCPSettings == nil {`
	`859`	`+ if c.RAWSettings != nil {`
`860`	`860`	`c.TCPSettings = c.RAWSettings`
`861`	`861`	`}`
`862`	`862`	`if c.TCPSettings != nil {`