Merge pull request #2345 from lucas-clemente/interop-qlog

export qlogs from the interop runner

interop/client/main.go

@@ -11,10 +11,13 @@ import (
 	"os"
 	"strings"
 
+	"golang.org/x/sync/errgroup"
+
+	"github.com/lucas-clemente/quic-go"
 	"github.com/lucas-clemente/quic-go/http3"
 	"github.com/lucas-clemente/quic-go/internal/protocol"
 	"github.com/lucas-clemente/quic-go/interop/http09"
-	"golang.org/x/sync/errgroup"
+	"github.com/lucas-clemente/quic-go/interop/utils"
 )
 
 var errUnsupported = errors.New("unsupported test case")
@@ -30,15 +33,13 @@ func main() {
 	defer logFile.Close()
 	log.SetOutput(logFile)
 
-	var keyLog io.Writer
-	if filename := os.Getenv("SSLKEYLOGFILE"); len(filename) > 0 {
-		f, err := os.Create(filename)
-		if err != nil {
-			fmt.Printf("Could not create key log file: %s\n", err.Error())
-			os.Exit(1)
-		}
-		defer f.Close()
-		keyLog = f
+	keyLog, err := utils.GetSSLKeyLog()
+	if err != nil {
+		fmt.Printf("Could not create key log: %s\n", err.Error())
+		os.Exit(1)
+	}
+	if keyLog != nil {
+		defer keyLog.Close()
 	}
 
 	tlsConf = &tls.Config{
@@ -60,9 +61,18 @@ func runTestcase(testcase string) error {
 	flag.Parse()
 	urls := flag.Args()
 
+	getLogWriter, err := utils.GetQLOGWriter()
+	if err != nil {
+		return err
+	}
+	quicConf := &quic.Config{GetLogWriter: getLogWriter}
+
 	switch testcase {
 	case "http3":
-		r := &http3.RoundTripper{TLSClientConfig: tlsConf}
+		r := &http3.RoundTripper{
+			TLSClientConfig: tlsConf,
+			QuicConfig:      quicConf,
+		}
 		defer r.Close()
 		return downloadFiles(r, urls)
 	case "handshake", "transfer", "retry":
@@ -76,7 +86,10 @@ func runTestcase(testcase string) error {
 		return errUnsupported
 	}
 
-	r := &http09.RoundTripper{TLSClientConfig: tlsConf}
+	r := &http09.RoundTripper{
+		TLSClientConfig: tlsConf,
+		QuicConfig:      quicConf,
+	}
 	defer r.Close()
 	return downloadFiles(r, urls)
 }

interop/server/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"crypto/tls"
 	"fmt"
-	"io"
 	"log"
 	"net"
 	"net/http"
@@ -13,6 +12,7 @@ import (
 	"github.com/lucas-clemente/quic-go/http3"
 	"github.com/lucas-clemente/quic-go/internal/testdata"
 	"github.com/lucas-clemente/quic-go/interop/http09"
+	"github.com/lucas-clemente/quic-go/interop/utils"
 )
 
 var tlsConf *tls.Config
@@ -26,22 +26,26 @@ func main() {
 	defer logFile.Close()
 	log.SetOutput(logFile)
 
-	var keyLog io.Writer
-	if filename := os.Getenv("SSLKEYLOGFILE"); len(filename) > 0 {
-		f, err := os.Create(filename)
-		if err != nil {
-			fmt.Printf("Could not create key log file: %s\n", err.Error())
-			os.Exit(1)
-		}
-		defer f.Close()
-		keyLog = f
+	keyLog, err := utils.GetSSLKeyLog()
+	if err != nil {
+		fmt.Printf("Could not create key log: %s\n", err.Error())
+		os.Exit(1)
+	}
+	if keyLog != nil {
+		defer keyLog.Close()
 	}
 
 	testcase := os.Getenv("TESTCASE")
 
+	getLogWriter, err := utils.GetQLOGWriter()
+	if err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
+	}
 	// a quic.Config that doesn't do a Retry
 	quicConf := &quic.Config{
-		AcceptToken: func(_ net.Addr, _ *quic.Token) bool { return true },
+		AcceptToken:  func(_ net.Addr, _ *quic.Token) bool { return true },
+		GetLogWriter: getLogWriter,
 	}
 	tlsConf = testdata.GetTLSConfig()
 	tlsConf.KeyLogWriter = keyLog

interop/utils/logging.go

@@ -0,0 +1,43 @@
+package utils
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"strings"
+)
+
+// GetSSLKeyLog creates a file for the TLS key log
+func GetSSLKeyLog() (io.WriteCloser, error) {
+	filename := os.Getenv("SSLKEYLOGFILE")
+	if len(filename) == 0 {
+		return nil, nil
+	}
+	f, err := os.Create(filename)
+	if err != nil {
+		return nil, err
+	}
+	return f, nil
+}
+
+// GetQLOGWriter creates the QLOGDIR and returns the GetLogWriter callback
+func GetQLOGWriter() (func(connID []byte) io.WriteCloser, error) {
+	qlogDir := os.Getenv("QLOGDIR")
+	if len(qlogDir) == 0 {
+		return nil, nil
+	}
+	if _, err := os.Stat(qlogDir); os.IsNotExist(err) {
+		if err := os.MkdirAll(qlogDir, 0666); err != nil {
+			return nil, fmt.Errorf("failed to create qlog dir %s: %s", qlogDir, err.Error())
+		}
+	}
+	return func(connID []byte) io.WriteCloser {
+		path := fmt.Sprintf("%s/%x.qlog", strings.TrimRight(qlogDir, "/"), connID)
+		f, err := os.Create(path)
+		if err != nil {
+			log.Fatalf("Failed to create qlog file %s: %s", path, err.Error())
+		}
+		return f
+	}, nil
+}