cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix comments

Browse Source
This commit is contained in:
bingtianbaihua 2020-09-22 23:51:11 +08:00
parent c6312219b4
commit 558eabe314
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/frpc_full.ini
View File

@ -46,7 +46,7 @@ user = your_name
login_fail_exit = true login_fail_exit = true
# communication protocol used to connect to server # communication protocol used to connect to server
# now it supports tcp, kcp, websocket and ntlm, default is tcp # now it supports tcp, kcp and websocket, default is tcp
protocol = tcp protocol = tcp
# if tls_enable is true, frpc will connect frps by tls # if tls_enable is true, frpc will connect frps by tls

2
models/config/client_common.go
View File

@ -100,7 +100,7 @@ type ClientCommonConf struct {
// set. // set.
Start map[string]struct{} `json:"start"` Start map[string]struct{} `json:"start"`
// Protocol specifies the protocol to use when interacting with the server. // Protocol specifies the protocol to use when interacting with the server.
// Valid values are "tcp", "kcp", "ntlm" and "websocket". By default, this value // Valid values are "tcp", "kcp" and "websocket". By default, this value
// is "tcp". // is "tcp".
Protocol string `json:"protocol"` Protocol string `json:"protocol"`
// TLSEnable specifies whether or not TLS should be used when communicating // TLSEnable specifies whether or not TLS should be used when communicating

2
utils/net/conn.go
View File

@ -222,8 +222,6 @@ func ConnectServerByProxy(proxyURL string, protocol string, addr string) (c net.
return ConnectServer(protocol, addr) return ConnectServer(protocol, addr)
case "websocket": case "websocket":
return ConnectWebsocketServer(addr) return ConnectWebsocketServer(addr)
case "ntlm":
return gnet.DialTcpByProxy(proxyURL, addr)
default: default:
return nil, fmt.Errorf("unsupport protocol: %s", protocol) return nil, fmt.Errorf("unsupport protocol: %s", protocol)
} }