Stop counting PQ certs transfer time in the startup benchmark

Author: jedisct1

dnscrypt-proxy/common.go

@@ -67,11 +67,11 @@ func PrefixWithSize(packet []byte) ([]byte, error) {
 	return packet, nil
 }
 
-func ReadPrefixed(conn *net.Conn) ([]byte, error) {
+func ReadPrefixed(conn net.Conn) ([]byte, error) {
 	buf := make([]byte, 2+MaxDNSPacketSize)
 	packetLength, pos := -1, 0
 	for {
-		readnb, err := (*conn).Read(buf[pos:])
+		readnb, err := conn.Read(buf[pos:])
 		if err != nil {
 			return buf, err
 		}

dnscrypt-proxy/dnsutils.go

@@ -474,6 +474,19 @@ func DNSExchange(
 	}
 }
 
+type firstReadConn struct {
+	net.Conn
+	firstReadAt time.Time
+}
+
+func (c *firstReadConn) Read(p []byte) (int, error) {
+	n, err := c.Conn.Read(p)
+	if n > 0 && c.firstReadAt.IsZero() {
+		c.firstReadAt = time.Now()
+	}
+	return n, err
+}
+
 func _dnsExchange(
 	proxy *Proxy,
 	proto string,
@@ -563,11 +576,12 @@ func _dnsExchange(
 		if _, err := pc.Write(binQuery); err != nil {
 			return DNSExchangeResponse{err: err}
 		}
-		packet, err = ReadPrefixed(&pc)
+		timedPc := &firstReadConn{Conn: pc}
+		packet, err = ReadPrefixed(timedPc)
 		if err != nil {
 			return DNSExchangeResponse{err: err}
 		}
-		rtt = time.Since(now)
+		rtt = timedPc.firstReadAt.Sub(now)
 	}
 	msg := dns.Msg{Data: packet}
 	if err := msg.Unpack(); err != nil {

dnscrypt-proxy/proxy.go

@@ -502,7 +502,7 @@ func (proxy *Proxy) tcpListener(acceptPc *net.TCPListener) {
 				return
 			}
 			start := time.Now()
-			packet, err := ReadPrefixed(&clientPc)
+			packet, err := ReadPrefixed(clientPc)
 			if err != nil {
 				return
 			}
@@ -736,7 +736,7 @@ func (proxy *Proxy) exchangeWithTCPServer(
 	if _, err := pc.Write(encryptedQuery); err != nil {
 		return nil, err
 	}
-	encryptedResponse, err := ReadPrefixed(&pc)
+	encryptedResponse, err := ReadPrefixed(pc)
 	if err != nil {
 		return nil, err
 	}