mirrors/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-16 10:51:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix the issue of duplicate xtcp proxies will cause the previous proxy to become ineffective (#3489)

Browse Source
This commit is contained in:
fatedier
2023-06-16 00:41:06 +08:00
committed by GitHub
parent e1cef053be
commit 15a245766e
5 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/nathole/controller.go
View File

@ -121,7 +121,7 @@ func (c *Controller) CleanWorker(ctx context.Context) {
}
}
func (c *Controller) ListenClient(name string, sk string, allowUsers []string) chan string {
func (c *Controller) ListenClient(name string, sk string, allowUsers []string) (chan string, error) {
cfg := &ClientCfg{
name: name,
sk: sk,
@ -130,9 +130,11 @@ func (c *Controller) ListenClient(name string, sk string, allowUsers []string) c
}
c.mu.Lock()
defer c.mu.Unlock()
// TODO(fatedier): return error if name already exists
if _, ok := c.clientCfgs[name]; ok {
return nil, fmt.Errorf("proxy [%s] is repeated", name)
}
c.clientCfgs[name] = cfg
return cfg.sidCh
return cfg.sidCh, nil
}
func (c *Controller) CloseClient(name string) {