handler.go: Actually check for DisableCookies field.

Author: Sandertv

conn.go

@@ -149,7 +149,7 @@ func (conn *Conn) startTicking() {
 				if before != 0 && acksLeft == 0 {
 					conn.closeImmediately()
 				}
-				since := time.Since(time.Unix(unix, 0))
+				since := t.Sub(time.Unix(unix, 0))
 				if (acksLeft == 0 && since > time.Second) || since > time.Second*5 {
 					conn.closeImmediately()
 				}
@@ -342,7 +342,7 @@ func (conn *Conn) Latency() time.Duration {
 	return time.Duration(conn.rtt.Load() / 2)
 }
 
-// send encodes an encoding.BinaryMarshaler and sends it.
+// send encodes an encoding.BinaryMarshaler and writes it to the Conn.
 func (conn *Conn) send(pk encoding.BinaryMarshaler) error {
 	b, _ := pk.MarshalBinary()
 	_, err := conn.Write(b)

handler.go

@@ -37,6 +37,9 @@ func (h listenerConnectionHandler) close(conn *Conn) {
 // cookie calculates a cookie for the net.Addr passed. It is calculated as a
 // hash of the random cookie salt and the address.
 func (h listenerConnectionHandler) cookie(addr net.Addr) uint32 {
+	if h.l.conf.DisableCookies {
+		return 0
+	}
 	udp, _ := addr.(*net.UDPAddr)
 	b := make([]byte, 6, 22)
 	binary.LittleEndian.PutUint32(b, h.cookieSalt)
@@ -93,15 +96,15 @@ func (h listenerConnectionHandler) handleOpenConnectionRequest1(b []byte, addr n
 		return fmt.Errorf("handle OPEN_CONNECTION_REQUEST_1: incompatible protocol version %v (listener protocol = %v)", pk.ClientProtocol, protocolVersion)
 	}
 
-	data, _ := (&message.OpenConnectionReply1{ServerGUID: h.l.id, Cookie: h.cookie(addr), ServerHasSecurity: true, MTU: mtuSize}).MarshalBinary()
+	data, _ := (&message.OpenConnectionReply1{ServerGUID: h.l.id, Cookie: h.cookie(addr), ServerHasSecurity: !h.l.conf.DisableCookies, MTU: mtuSize}).MarshalBinary()
 	_, err := h.l.conn.WriteTo(data, addr)
 	return err
 }
 
 // handleOpenConnectionRequest2 handles an open connection request 2 packet
 // stored in buffer b, coming from an address.
 func (h listenerConnectionHandler) handleOpenConnectionRequest2(b []byte, addr net.Addr) error {
-	pk := &message.OpenConnectionRequest2{ServerHasSecurity: true}
+	pk := &message.OpenConnectionRequest2{ServerHasSecurity: !h.l.conf.DisableCookies}
 	if err := pk.UnmarshalBinary(b); err != nil {
 		return fmt.Errorf("read OPEN_CONNECTION_REQUEST_2: %w", err)
 	}