fix yinqiwen#106

sbilly · Nov 17, 2020 · 85558ae · 85558ae
1 parent d547b42
commit 85558ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/common/channel/quic/remote.go b/common/channel/quic/remote.go
@@ -1,6 +1,7 @@
 package quic
 
 import (
+	"context"
 	"crypto/tls"
 
 	quic "github.com/lucas-clemente/quic-go"
@@ -11,7 +12,7 @@ import (
 
 func servQUIC(lp quic.Listener) {
 	for {
-		sess, err := lp.Accept()
+		sess, err := lp.Accept(context.Background())
 		if nil != err {
 			continue
 		}

diff --git a/common/mux/quic.go b/common/mux/quic.go
@@ -1,6 +1,7 @@
 package mux
 
 import (
+	"context"
 	"net"
 	"sync/atomic"
 	"time"
@@ -23,7 +24,7 @@ func (q *QUICMuxSession) CloseStream(stream MuxStream) error {
 }
 
 func (q *QUICMuxSession) OpenStream() (MuxStream, error) {
-	s, err := q.OpenStreamSync()
+	s, err := q.OpenStreamSync(context.Background())
 	if nil != err {
 		return nil, err
 	}
@@ -32,7 +33,7 @@ func (q *QUICMuxSession) OpenStream() (MuxStream, error) {
 }
 
 func (q *QUICMuxSession) AcceptStream() (MuxStream, error) {
-	s, err := q.Session.AcceptStream()
+	s, err := q.Session.AcceptStream(context.Background())
 	if nil != err {
 		return nil, err
 	}
@@ -45,7 +46,7 @@ func (q *QUICMuxSession) NumStreams() int {
 
 func (q *QUICMuxSession) Close() error {
 	q.streamCounter = 0
-	return q.Session.Close()
+	return q.Session.CloseWithError(0, "")
 }
 func (s *QUICMuxSession) RemoteAddr() net.Addr {
 	return nil