black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 00:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: JSON tag case (#1212) (#778)

Browse source 
JSON unmarshal is case insensitive in Golang

Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
This commit is contained in:
yuhan6665 2021-10-22 00:01:31 -04:00 committed by 世界
parent 3c7189a3e7
commit 3bf3d96472
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
infra/conf/transport_internet.go
View file

@ -141,7 +141,6 @@ func (c *TCPConfig) Build() (proto.Message, error) {
type WebSocketConfig struct { type WebSocketConfig struct {
Path string `json:"path"` 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"` Headers map[string]string `json:"headers"`
AcceptProxyProtocol bool `json:"acceptProxyProtocol"` AcceptProxyProtocol bool `json:"acceptProxyProtocol"`
} }
@ -149,9 +148,6 @@ type WebSocketConfig struct {
// Build implements Buildable. // Build implements Buildable.
func (c *WebSocketConfig) Build() (proto.Message, error) { func (c *WebSocketConfig) Build() (proto.Message, error) {
path := c.Path path := c.Path
if path == "" && c.Path2 != "" {
path = c.Path2
}
header := make([]*websocket.Header, 0, 32) header := make([]*websocket.Header, 0, 32)
for key, value := range c.Headers { for key, value := range c.Headers {
header = append(header, &websocket.Header{ header = append(header, &websocket.Header{
@ -503,14 +499,13 @@ func (p TransportProtocol) Build() (string, error) {
} }
type SocketConfig struct { type SocketConfig struct {
Mark int32 `json:"mark"` Mark int32 `json:"mark"`
TFO interface{} `json:"tcpFastOpen"` TFO interface{} `json:"tcpFastOpen"`
TProxy string `json:"tproxy"` TProxy string `json:"tproxy"`
AcceptProxyProtocol bool `json:"acceptProxyProtocol"` AcceptProxyProtocol bool `json:"acceptProxyProtocol"`
DomainStrategy string `json:"domainStrategy"` DomainStrategy string `json:"domainStrategy"`
DialerProxy string `json:"dialerProxy"` DialerProxy string `json:"dialerProxy"`
TCPKeepAliveInterval int32 `json:"tcpKeepAliveInterval"`
TCPKeepAliveInterval int32 `json:"tcpKeepAliveInterval"`
} }
// Build implements Buildable. // Build implements Buildable.