apps/openlan
1
0
Fork 0
mirror of https://github.com/luscis/openlan.git synced 2025-10-07 01:22:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fea: socket: support to negotiate key

Browse Source
This commit is contained in:
Daniel Ding
2022-10-01 08:21:53 +08:00
parent 1f5bdbe45c
commit 4a6eaeb802
24 changed files with 315 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/libol/websocket.go
View File

@@ -3,7 +3,6 @@ package libol
import (
"crypto/tls"
"crypto/x509"
"github.com/xtaci/kcp-go/v5"
"golang.org/x/net/websocket"
"io/ioutil"
"net"
@@ -36,7 +35,7 @@ type CertConfig struct {
type WebConfig struct {
Cert *CertConfig
Block kcp.BlockCrypt
Block *BlockCrypt
Timeout time.Duration // ns
RdQus int // per frames
WrQus int // per frames
@@ -132,8 +131,10 @@ type WebClient struct {
func NewWebClient(addr string, cfg *WebConfig) *WebClient {
t := &WebClient{
webCfg: cfg,
SocketClientImpl: NewSocketClient(addr, &StreamMessagerImpl{
block: cfg.Block,
SocketClientImpl: NewSocketClient(SocketConfig{
Address: addr,
Block: cfg.Block,
}, &StreamMessagerImpl{
timeout: cfg.Timeout,
bufSize: cfg.RdQus * MaxFrame,
}),
@@ -146,14 +147,16 @@ func NewWebClientFromConn(conn net.Conn, cfg *WebConfig) *WebClient {
addr := conn.RemoteAddr().String()
t := &WebClient{
webCfg: cfg,
SocketClientImpl: NewSocketClient(addr, &StreamMessagerImpl{
block: cfg.Block,
SocketClientImpl: NewSocketClient(SocketConfig{
Address: addr,
Block: cfg.Block,
}, &StreamMessagerImpl{
timeout: cfg.Timeout,
bufSize: cfg.RdQus * MaxFrame,
}),
done: make(chan bool, 2),
}
t.updateConn(conn)
t.update(conn)
return t
}
@@ -197,7 +200,7 @@ func (t *WebClient) Connect() error {
if err != nil {
return err
}
t.SetConnection(conn)
t.Reset(conn)
if t.listener.OnConnected != nil {
_ = t.listener.OnConnected(t)
}
@@ -211,7 +214,7 @@ func (t *WebClient) Close() {
if t.status != ClTerminal {
t.status = ClClosed
}
t.updateConn(nil)
t.update(nil)
t.done <- true
t.private = nil
t.lock.Unlock()