hyung-hwan/hodu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch to use Atom for connect_ssh_cancel

Browse Source
This commit is contained in:
hyung-hwan 2025-03-28 00:56:58 +09:00
parent 0cfd241e00
commit fd28add458
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server-pxy.go
View File

@ -661,7 +661,7 @@ func (pxy *server_pxy_ssh_ws) ServeWebsocket(ws *websocket.Conn) (int, error) {
var wg sync.WaitGroup var wg sync.WaitGroup
var conn_ready_chan chan bool var conn_ready_chan chan bool
var connect_ssh_ctx context.Context var connect_ssh_ctx context.Context
var connect_ssh_cancel context.CancelFunc var connect_ssh_cancel Atom[context.CancelFunc]
var err error var err error
s = pxy.s s = pxy.s
@ -739,10 +739,13 @@ ws_recv_loop:
switch ev.Type { switch ev.Type {
case "open": case "open":
if sess == nil && len(ev.Data) == 2 { if sess == nil && len(ev.Data) == 2 {
var cancel context.CancelFunc
username = string(ev.Data[0]) username = string(ev.Data[0])
password = string(ev.Data[1]) password = string(ev.Data[1])
connect_ssh_ctx, connect_ssh_cancel = context.WithTimeout(req.Context(), 10 * time.Second) // TODO: configurable timeout connect_ssh_ctx, cancel = context.WithTimeout(req.Context(), 10 * time.Second) // TODO: configurable timeout
connect_ssh_cancel.Set(cancel)
wg.Add(1) wg.Add(1)
go func() { go func() {
@ -763,14 +766,14 @@ ws_recv_loop:
conn_ready_chan <- true conn_ready_chan <- true
} }
} }
connect_ssh_cancel() (connect_ssh_cancel.Get())()
connect_ssh_cancel = nil connect_ssh_cancel.Set(nil)
}() }()
} }
case "close": case "close":
var cancel context.CancelFunc var cancel context.CancelFunc
cancel = connect_ssh_cancel // is it a good way to avoid mutex? cancel = connect_ssh_cancel.Get() // is it a good way to avoid mutex?
if cancel != nil { cancel() } if cancel != nil { cancel() }
break ws_recv_loop break ws_recv_loop