Changeset 465 in code

Timestamp:

Mar 16, 2021, 8:19:12 AM (4 years ago)

Author:

contact

Message:

Correctly set WebSocket read/write deadline

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

File:

• trunk/conn.go (modified) (3 diffs)

trunk/conn.go

@@ -42 +42 @@
 
 func newWebsocketIRCConn(c *websocket.Conn, remoteAddr string) ircConn {
-        return websocketIRCConn{conn: c, remoteAddr: remoteAddr}
-}
-
-func (wic websocketIRCConn) ReadMessage() (*irc.Message, error) {
+        return &websocketIRCConn{conn: c, remoteAddr: remoteAddr}
+}
+
+func (wic *websocketIRCConn) ReadMessage() (*irc.Message, error) {
         ctx := context.Background()
         if !wic.readDeadline.IsZero() {
@@ -64 +64 @@
 }
 
-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)))
         ctx := context.Background()
@@ -75 +75 @@
 }
 
-func (wic websocketIRCConn) Close() error {
+func (wic *websocketIRCConn) Close() error {
         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
         return nil
 }
 
-func (wic websocketIRCConn) SetWriteDeadline(t time.Time) error {
+func (wic *websocketIRCConn) SetWriteDeadline(t time.Time) error {
         wic.writeDeadline = t
         return nil
 }
 
-func (wic websocketIRCConn) RemoteAddr() net.Addr {
+func (wic *websocketIRCConn) RemoteAddr() net.Addr {
         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
         // address