mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

replace the GetLogWriter quic.Config option by a Tracer interface

Browse source
This commit is contained in:
Marten Seemann 2020-06-29 13:31:43 +07:00
parent 4121ea84f4
commit ac606222e0
16 changed files with 129 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

9
example/client/main.go
View file

@ -17,6 +17,7 @@ import (
"github.com/lucas-clemente/quic-go/http3"
"github.com/lucas-clemente/quic-go/internal/testdata"
"github.com/lucas-clemente/quic-go/internal/utils"
"github.com/lucas-clemente/quic-go/qlog"
)
func main() {
@ -24,7 +25,7 @@ func main() {
quiet := flag.Bool("q", false, "don't print the data")
keyLogFile := flag.String("keylog", "", "key log file")
insecure := flag.Bool("insecure", false, "skip certificate verification")
qlog := flag.Bool("qlog", false, "output a qlog (in the same directory)")
enableQlog := flag.Bool("qlog", false, "output a qlog (in the same directory)")
flag.Parse()
urls := flag.Args()
@ -54,8 +55,8 @@ func main() {
testdata.AddRootCA(pool)
var qconf quic.Config
if *qlog {
qconf.GetLogWriter = func(connID []byte) io.WriteCloser {
if *enableQlog {
qconf.Tracer = qlog.NewTracer(func(connID []byte) io.WriteCloser {
filename := fmt.Sprintf("client_%x.qlog", connID)
f, err := os.Create(filename)
if err != nil {
@ -63,7 +64,7 @@ func main() {
}
log.Printf("Creating qlog file %s.\n", filename)
return utils.NewBufferedWriteCloser(bufio.NewWriter(f), f)
}
})
}
roundTripper := &http3.RoundTripper{
TLSClientConfig: &tls.Config{

9
example/main.go
View file

@ -22,6 +22,7 @@ import (
"github.com/lucas-clemente/quic-go/http3"
"github.com/lucas-clemente/quic-go/internal/testdata"
"github.com/lucas-clemente/quic-go/internal/utils"
"github.com/lucas-clemente/quic-go/qlog"
"github.com/lucas-clemente/quic-go/quictrace"
)
@ -187,7 +188,7 @@ func main() {
www := flag.String("www", "", "www data")
tcp := flag.Bool("tcp", false, "also listen on TCP")
trace := flag.Bool("trace", false, "enable quic-trace")
qlog := flag.Bool("qlog", false, "output a qlog (in the same directory)")
enableQlog := flag.Bool("qlog", false, "output a qlog (in the same directory)")
flag.Parse()
logger := utils.DefaultLogger
@ -208,8 +209,8 @@ func main() {
if *trace {
quicConf.QuicTracer = tracer
}
if *qlog {
quicConf.GetLogWriter = func(connID []byte) io.WriteCloser {
if *enableQlog {
quicConf.Tracer = qlog.NewTracer(func(connID []byte) io.WriteCloser {
filename := fmt.Sprintf("server_%x.qlog", connID)
f, err := os.Create(filename)
if err != nil {
@ -217,7 +218,7 @@ func main() {
}
log.Printf("Creating qlog file %s.\n", filename)
return utils.NewBufferedWriteCloser(bufio.NewWriter(f), f)
}
})
}
var wg sync.WaitGroup