Fix: JSON tag case (#1212)

JSON unmarshal is case insensitive in Golang
v2fly · Aug 19, 2021 · 5794a97 · 5794a97
1 parent 8f429c3
commit 5794a97
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
@@ -139,7 +139,6 @@ func (c *TCPConfig) Build() (proto.Message, error) {
 
 type WebSocketConfig struct {
 	Path                 string            `json:"path"`
-	Path2                string            `json:"Path"` // The key was misspelled. For backward compatibility, we have to keep track the old key.
 	Headers              map[string]string `json:"headers"`
 	AcceptProxyProtocol  bool              `json:"acceptProxyProtocol"`
 	MaxEarlyData         int32             `json:"maxEarlyData"`
@@ -150,9 +149,6 @@ type WebSocketConfig struct {
 // Build implements Buildable.
 func (c *WebSocketConfig) Build() (proto.Message, error) {
 	path := c.Path
-	if path == "" && c.Path2 != "" {
-		path = c.Path2
-	}
 	header := make([]*websocket.Header, 0, 32)
 	for key, value := range c.Headers {
 		header = append(header, &websocket.Header{
@@ -385,12 +381,11 @@ func (p TransportProtocol) Build() (string, error) {
 }
 
 type SocketConfig struct {
-	Mark                int32  `json:"mark"`
-	TFO                 *bool  `json:"tcpFastOpen"`
-	TProxy              string `json:"tproxy"`
-	AcceptProxyProtocol bool   `json:"acceptProxyProtocol"`
-
-	TCPKeepAliveInterval int32 `json:"tcpKeepAliveInterval"`
+	Mark                 int32  `json:"mark"`
+	TFO                  *bool  `json:"tcpFastOpen"`
+	TProxy               string `json:"tproxy"`
+	AcceptProxyProtocol  bool   `json:"acceptProxyProtocol"`
+	TCPKeepAliveInterval int32  `json:"tcpKeepAliveInterval"`
 }
 
 // Build implements Buildable.