go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve cidr matcher

Browse Source
This commit is contained in:
ginuerzh
2022-08-31 10:10:14 +08:00
parent d043ad94e7
commit be7af96d40
10 changed files with 42 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dialer/ws/dialer.go
View File

@ -109,7 +109,7 @@ func (d *wsDialer) Handshake(ctx context.Context, conn net.Conn, options ...dial
c.SetReadDeadline(time.Now().Add(d.md.keepAlive * 2))
c.SetPongHandler(func(string) error {
c.SetReadDeadline(time.Now().Add(d.md.keepAlive * 2))
d.options.Logger.Infof("pong: set read deadline: %v", d.md.keepAlive*2)
d.options.Logger.Debugf("pong: set read deadline: %v", d.md.keepAlive*2)
return nil
})
go d.keepAlive(cc)
@ -127,6 +127,6 @@ func (d *wsDialer) keepAlive(conn ws_util.WebsocketConn) {
if err := conn.WriteMessage(websocket.PingMessage, nil); err != nil {
return
}
d.options.Logger.Infof("send ping")
d.options.Logger.Debug("send ping")
}
}

16
dialer/ws/metadata.go
View File

@ -9,7 +9,8 @@ import (
)
const (
defaultPath = "/ws"
defaultPath = "/ws"
defaultKeepAlivePeriod = 15 * time.Second
)
type metadata struct {
@ -37,8 +38,9 @@ func (d *wsDialer) parseMetadata(md mdata.Metadata) (err error) {
writeBufferSize = "writeBufferSize"
enableCompression = "enableCompression"
header = "header"
keepAlive = "keepAlive"
header = "header"
keepAlive = "keepAlive"
keepAlivePeriod = "ttl"
)
d.md.host = mdx.GetString(md, host)
@ -61,7 +63,13 @@ func (d *wsDialer) parseMetadata(md mdata.Metadata) (err error) {
}
d.md.header = h
}
d.md.keepAlive = mdx.GetDuration(md, keepAlive)
if mdx.GetBool(md, keepAlive) {
d.md.keepAlive = mdx.GetDuration(md, keepAlivePeriod)
if d.md.keepAlive <= 0 {
d.md.keepAlive = defaultKeepAlivePeriod
}
}
return
}