XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-27 07:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #886 from fatedier/websocket

Browse Source 
Connect protocol support websocket
This commit is contained in:
fatedier
2018-08-10 16:36:02 +08:00
committed by GitHub
parent ca88b07ecf 07623027bc
commit f14ed87b29
12 changed files with 1480 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
models/config/client_common.go
View File

@@ -186,9 +186,10 @@ func UnmarshalClientConfFromIni(defaultCfg *ClientCommonConf, content string) (c
}
if tmpStr, ok = conf.Get("common", "protocol"); ok {
// Now it only support tcp and kcp.
if tmpStr != "kcp" {
tmpStr = "tcp"
// Now it only support tcp and kcp and websocket.
if tmpStr != "tcp" && tmpStr != "kcp" && tmpStr != "websocket" {
err = fmt.Errorf("Parse conf error: invalid protocol")
return
}
cfg.Protocol = tmpStr
}