diff options
| author | David Fifield <david@bamsoftware.com> | 2020-02-21 15:21:07 -0700 |
|---|---|---|
| committer | David Fifield <david@bamsoftware.com> | 2020-02-21 20:36:07 -0700 |
| commit | 42c07f2c140e4c6f1f752329a67fdf15cd6bd8c5 (patch) | |
| tree | 1873cb67560822ebd0a87c76e6d2f89dd5e42cc5 | |
| parent | a05f5efc7966bcbf71d0a9410d4656a221bcb1bb (diff) | |
Make work with quic-go 2e59206a1ee73636e7687d272ad007befd007d5b.
| -rw-r--r-- | client/lib/snowflake.go | 4 | ||||
| -rw-r--r-- | server/server.go | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 671ef5d..7dfa03c 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -69,14 +69,14 @@ func Handler(socks net.Conn, snowflakes SnowflakeCollector) error { } quicConfig := &quic.Config{ HandshakeTimeout: 2 * time.Minute, - IdleTimeout: 10 * time.Minute, + MaxIdleTimeout: 10 * time.Minute, KeepAlive: true, // To keep WebRTCPeer.checkForStaleness happy. } sess, err := quic.Dial(pconn, dummyAddr{}, "dummy:dummy", tlsConfig, quicConfig) if err != nil { return err } - defer sess.Close() + defer sess.CloseWithError(0, "normal close") // On the QUIC connection we overlay a stream. stream, err := sess.OpenStream() if err != nil { diff --git a/server/server.go b/server/server.go index 98dc18e..96904f8 100644 --- a/server/server.go +++ b/server/server.go @@ -386,7 +386,7 @@ func acceptStreamsQUIC(ctx context.Context, sess quic.Session) error { } for { - stream, err := sess.AcceptStream() + stream, err := sess.AcceptStream(ctx) if err != nil { if err, ok := err.(net.Error); ok && err.Temporary() { continue @@ -410,7 +410,7 @@ func acceptStreamsQUIC(ctx context.Context, sess quic.Session) error { // interface that drives this function. func acceptSessionsQUIC(ctx context.Context, ln quic.Listener) error { for { - sess, err := ln.Accept() + sess, err := ln.Accept(ctx) if err != nil { if err, ok := err.(net.Error); ok && err.Temporary() { continue @@ -418,7 +418,7 @@ func acceptSessionsQUIC(ctx context.Context, ln quic.Listener) error { return err } go func() { - defer sess.Close() + defer sess.CloseWithError(0, "normal close") ctx, cancel := context.WithCancel(ctx) defer cancel() err := acceptStreamsQUIC(ctx, sess) @@ -515,7 +515,7 @@ func initServer(addr *net.TCPAddr, } quicConfig := &quic.Config{ HandshakeTimeout: 2 * time.Minute, - IdleTimeout: 10 * time.Minute, + MaxIdleTimeout: 10 * time.Minute, } lnQUIC, err := quic.Listen(handler.pconnQUIC, tlsConfig, quicConfig) if err != nil { |