sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly set WebSocket read/write deadline

Browse Source 
The methods didn't have pointer receivers. Thus the deadline fields
were only updated for the local variable.

Closes: https://todo.sr.ht/~emersion/soju/106
This commit is contained in:
Simon Ser 2021-03-16 09:17:31 +01:00
parent 26c5c11caf
commit 67fb669434
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
conn.go
View File

@ -41,10 +41,10 @@ type websocketIRCConn struct {
} }
func newWebsocketIRCConn(c *websocket.Conn, remoteAddr string) ircConn { func newWebsocketIRCConn(c *websocket.Conn, remoteAddr string) ircConn {
return websocketIRCConn{conn: c, remoteAddr: remoteAddr} return &websocketIRCConn{conn: c, remoteAddr: remoteAddr}
} }
func (wic websocketIRCConn) ReadMessage() (*irc.Message, error) { func (wic *websocketIRCConn) ReadMessage() (*irc.Message, error) {
ctx := context.Background() ctx := context.Background()
if !wic.readDeadline.IsZero() { if !wic.readDeadline.IsZero() {
var cancel context.CancelFunc var cancel context.CancelFunc
@ -63,7 +63,7 @@ func (wic websocketIRCConn) ReadMessage() (*irc.Message, error) {
return irc.ParseMessage(string(b)) return irc.ParseMessage(string(b))
} }
func (wic websocketIRCConn) WriteMessage(msg *irc.Message) error { func (wic *websocketIRCConn) WriteMessage(msg *irc.Message) error {
b := []byte(strings.ToValidUTF8(msg.String(), string(unicode.ReplacementChar))) b := []byte(strings.ToValidUTF8(msg.String(), string(unicode.ReplacementChar)))
ctx := context.Background() ctx := context.Background()
if !wic.writeDeadline.IsZero() { if !wic.writeDeadline.IsZero() {
@ -74,25 +74,25 @@ func (wic websocketIRCConn) WriteMessage(msg *irc.Message) error {
return wic.conn.Write(ctx, websocket.MessageText, b) return wic.conn.Write(ctx, websocket.MessageText, b)
} }
func (wic websocketIRCConn) Close() error { func (wic *websocketIRCConn) Close() error {
return wic.conn.Close(websocket.StatusNormalClosure, "") return wic.conn.Close(websocket.StatusNormalClosure, "")
} }
func (wic websocketIRCConn) SetReadDeadline(t time.Time) error { func (wic *websocketIRCConn) SetReadDeadline(t time.Time) error {
wic.readDeadline = t wic.readDeadline = t
return nil return nil
} }
func (wic websocketIRCConn) SetWriteDeadline(t time.Time) error { func (wic *websocketIRCConn) SetWriteDeadline(t time.Time) error {
wic.writeDeadline = t wic.writeDeadline = t
return nil return nil
} }
func (wic websocketIRCConn) RemoteAddr() net.Addr { func (wic *websocketIRCConn) RemoteAddr() net.Addr {
return websocketAddr(wic.remoteAddr) return websocketAddr(wic.remoteAddr)
} }
func (wic websocketIRCConn) LocalAddr() net.Addr { func (wic *websocketIRCConn) LocalAddr() net.Addr {
// Behind a reverse HTTP proxy, we don't have access to the real listening // Behind a reverse HTTP proxy, we don't have access to the real listening
// address // address
return websocketAddr("") return websocketAddr("")