Chore: use alpn http 1.1 only on trojan websocket by default

Dreamacro · Dreamacro · commit c6cceeb0c589 · 2021-10-19T22:34:18.000+08:00
diff --git a/transport/trojan/trojan.go b/transport/trojan/trojan.go
@@ -22,8 +22,10 @@ const (
 )
 
 var (
-	defaultALPN = []string{"h2", "http/1.1"}
-	crlf        = []byte{'\r', '\n'}
+	defaultALPN          = []string{"h2", "http/1.1"}
+	defaultWebsocketALPN = []string{"http/1.1"}
+
+	crlf = []byte{'\r', '\n'}
 )
 
 type Command = byte
@@ -74,7 +76,7 @@ func (t *Trojan) StreamConn(conn net.Conn) (net.Conn, error) {
 }
 
 func (t *Trojan) StreamWebsocketConn(conn net.Conn, wsOptions *WebsocketOption) (net.Conn, error) {
-	alpn := defaultALPN
+	alpn := defaultWebsocketALPN
 	if len(t.option.ALPN) != 0 {
 		alpn = t.option.ALPN
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,10 @@ const (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`var (`
`25`		`- defaultALPN = []string{"h2", "http/1.1"}`
`26`		`- crlf = []byte{'\r', '\n'}`
	`25`	`+ defaultALPN = []string{"h2", "http/1.1"}`
	`26`	`+ defaultWebsocketALPN = []string{"http/1.1"}`
	`27`	`+`
	`28`	`+ crlf = []byte{'\r', '\n'}`
`27`	`29`	`)`
`28`	`30`
`29`	`31`	`type Command = byte`
`@@ -74,7 +76,7 @@ func (t *Trojan) StreamConn(conn net.Conn) (net.Conn, error) {`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`func (t Trojan) StreamWebsocketConn(conn net.Conn, wsOptions WebsocketOption) (net.Conn, error) {`
`77`		`- alpn := defaultALPN`
	`79`	`+ alpn := defaultWebsocketALPN`
`78`	`80`	`if len(t.option.ALPN) != 0 {`
`79`	`81`	`alpn = t.option.ALPN`
`80`	`82`	`}`