extern/frp
1
1
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2024-12-13 10:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix xtcp cmd

Browse Source
This commit is contained in:
fatedier 2019-03-03 23:44:44 +08:00
parent 3cf83f57a8
commit ba45d29b7c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/visitor.go
View File

@ -280,6 +280,8 @@ func (sv *XtcpVisitor) handleConn(userConn frpNet.Conn) {
sv.Error("listen on visitorConn's local adress error: %v", err) sv.Error("listen on visitorConn's local adress error: %v", err)
return return
} }
defer lConn.Close()
lConn.SetReadDeadline(time.Now().Add(5 * time.Second)) lConn.SetReadDeadline(time.Now().Add(5 * time.Second))
sidBuf := pool.GetBuf(1024) sidBuf := pool.GetBuf(1024)
n, _, err = lConn.ReadFromUDP(sidBuf) n, _, err = lConn.ReadFromUDP(sidBuf)

4
cmd/frpc/sub/xtcp.go
View File

@ -68,7 +68,7 @@ var xtcpCmd = &cobra.Command{
if role == "server" { if role == "server" {
cfg := &config.XtcpProxyConf{} cfg := &config.XtcpProxyConf{}
cfg.ProxyName = prefix + proxyName cfg.ProxyName = prefix + proxyName
cfg.ProxyType = consts.StcpProxy cfg.ProxyType = consts.XtcpProxy
cfg.UseEncryption = useEncryption cfg.UseEncryption = useEncryption
cfg.UseCompression = useCompression cfg.UseCompression = useCompression
cfg.Role = role cfg.Role = role
@ -84,7 +84,7 @@ var xtcpCmd = &cobra.Command{
} else if role == "visitor" { } else if role == "visitor" {
cfg := &config.XtcpVisitorConf{} cfg := &config.XtcpVisitorConf{}
cfg.ProxyName = prefix + proxyName cfg.ProxyName = prefix + proxyName
cfg.ProxyType = consts.StcpProxy cfg.ProxyType = consts.XtcpProxy
cfg.UseEncryption = useEncryption cfg.UseEncryption = useEncryption
cfg.UseCompression = useCompression cfg.UseCompression = useCompression
cfg.Role = role cfg.Role = role