From 652ffe37cc54ce7e033a8eb09961ae47693b65ec Mon Sep 17 00:00:00 2001 From: Sergey Stepanov Date: Sat, 4 Feb 2023 20:32:16 +0300 Subject: [PATCH] Do not track DTLS errors (client disconnect) on WebRTC close --- go.mod | 2 +- pkg/network/webrtc/webrtc.go | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index a2905e1d..a45fb5c3 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/gofrs/flock v0.8.1 github.com/gorilla/websocket v1.5.0 github.com/kkyr/fig v0.3.1-0.20220103220255-711af35e3ee2 - github.com/pion/dtls/v2 v2.1.5 github.com/pion/interceptor v0.1.12 github.com/pion/logging v0.2.2 github.com/pion/webrtc/v3 v3.1.51 @@ -28,6 +27,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pion/datachannel v1.5.5 // indirect + github.com/pion/dtls/v2 v2.1.5 // indirect github.com/pion/ice/v2 v2.2.13 // indirect github.com/pion/mdns v0.0.5 // indirect github.com/pion/randutil v0.1.0 // indirect diff --git a/pkg/network/webrtc/webrtc.go b/pkg/network/webrtc/webrtc.go index 5cc9ce15..39ea1f47 100644 --- a/pkg/network/webrtc/webrtc.go +++ b/pkg/network/webrtc/webrtc.go @@ -1,12 +1,10 @@ package webrtc import ( - "errors" "fmt" "strings" "github.com/giongto35/cloud-game/v2/pkg/logger" - "github.com/pion/dtls/v2" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" ) @@ -28,7 +26,6 @@ func New(log *logger.Logger, api *ApiFactory) *Peer { return &Peer{api: api, log func (p *Peer) NewCall(vCodec, aCodec string, onICECandidate func(ice any)) (sdp any, err error) { if p.IsConnected() { - p.log.Warn().Msg("Strange multiple init connection calls with the same peer") return } p.log.Info().Msg("WebRTC start") @@ -170,11 +167,8 @@ func (p *Peer) Disconnect() { if p.conn == nil { return } - if p.conn.ConnectionState() < webrtc.PeerConnectionStateDisconnected { - if err := p.conn.Close(); err != nil && !errors.Is(err, dtls.ErrConnClosed) { - p.log.Error().Err(err).Msg("WebRTC close") - } + _ = p.conn.Close() } p.conn = nil p.log.Debug().Msg("WebRTC stop")