Skip to content

Commit

Permalink
update pion/ice
Browse files Browse the repository at this point in the history
  • Loading branch information
@sukunrt
sukunrt committed Jun 12, 2024
1 parent 64d8afb commit 8a6b544
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 22 deletions.
4 changes: 1 addition & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ require (
github.com/multiformats/go-varint v0.0.7
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
github.com/pion/datachannel v1.5.6
github.com/pion/ice/v2 v2.3.24
github.com/pion/ice/v2 v2.3.25
github.com/pion/logging v0.2.2
github.com/pion/sctp v1.8.16
github.com/pion/stun v0.6.1
Expand Down Expand Up @@ -126,5 +126,3 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.2.1 // indirect
)

replace github.com/pion/ice/v2 => github.com/pion/ice/v2 v2.3.25-0.20240609174246-45043bdb58c3
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ github.com/pion/datachannel v1.5.6/go.mod h1:1eKT6Q85pRnr2mHiWHxJwO50SfZRtWHTsNI
github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
github.com/pion/dtls/v2 v2.2.11 h1:9U/dpCYl1ySttROPWJgqWKEylUdT0fXp/xst6JwY5Ks=
github.com/pion/dtls/v2 v2.2.11/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE=
github.com/pion/ice/v2 v2.3.25-0.20240609174246-45043bdb58c3 h1:0GtcVIH0YUX41lBVsuTTLny5S1FTdcVdD7iXYh2Trb8=
github.com/pion/ice/v2 v2.3.25-0.20240609174246-45043bdb58c3/go.mod h1:KXJJcZK7E8WzrBEYnV4UtqEZsGeWfHxsNqhVcVvgjxw=
github.com/pion/ice/v2 v2.3.25 h1:M5rJA07dqhi3nobJIg+uPtcVjFECTrhcR3n0ns8kDZs=
github.com/pion/ice/v2 v2.3.25/go.mod h1:KXJJcZK7E8WzrBEYnV4UtqEZsGeWfHxsNqhVcVvgjxw=
github.com/pion/interceptor v0.1.29 h1:39fsnlP1U8gw2JzOFWdfCU82vHvhW9o0rZnZF56wF+M=
github.com/pion/interceptor v0.1.29/go.mod h1:ri+LGNjRUc5xUNtDEPzfdkmSqISixVTBF/z/Zms/6T4=
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
Expand Down
16 changes: 6 additions & 10 deletions p2p/transport/webrtc/listener.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (c *connMultiaddrs) LocalMultiaddr() ma.Multiaddr { return c.local }
func (c *connMultiaddrs) RemoteMultiaddr() ma.Multiaddr { return c.remote }

const (
candidateSetupTimeout = 60 * time.Second
candidateSetupTimeout = 20 * time.Second
DefaultMaxInFlightConnections = 10
)

Expand Down Expand Up @@ -128,12 +128,11 @@ func (l *listener) listen() {

ctx, cancel := context.WithTimeout(l.ctx, candidateSetupTimeout)
defer cancel()
fmt.Println("received UFrag", candidate.Ufrag, candidate.Addr)

conn, err := l.handleCandidate(ctx, candidate)
if err != nil {
l.mux.RemoveConnByUfrag(candidate.Ufrag)
log.Errorf("could not accept connection: %s: %v", candidate.Ufrag, err)
fmt.Printf("could not accept connection: %s: %v\n", candidate.Ufrag, err)
log.Debugf("could not accept connection: %s: %v", candidate.Ufrag, err)
return
}

Expand Down Expand Up @@ -220,7 +219,7 @@ func (l *listener) setupConnection(
return nil, fmt.Errorf("instantiating peer connection failed: %w", err)
}

errC := addOnConnectionStateChangeCallback(w.PeerConnection, "listener")
errC := addOnConnectionStateChangeCallback(w.PeerConnection)
// Infer the client SDP from the incoming STUN message by setting the ice-ufrag.
if err := w.PeerConnection.SetRemoteDescription(webrtc.SessionDescription{
SDP: createClientSDP(candidate.Addr, candidate.Ufrag),
Expand Down Expand Up @@ -327,12 +326,10 @@ func (l *listener) Multiaddr() ma.Multiaddr {
// * is closed when the state changes to Connection
// * receives an error when the state changes to Failed
// * doesn't receive anything (nor is closed) when the state changes to Disconnected
func addOnConnectionStateChangeCallback(pc *webrtc.PeerConnection, side string) <-chan error {
func addOnConnectionStateChangeCallback(pc *webrtc.PeerConnection) <-chan error {
errC := make(chan error, 1)
var once sync.Once
st := time.Now()
pc.OnConnectionStateChange(func(state webrtc.PeerConnectionState) {
fmt.Println("state received: ", side, state, pc.ConnectionState(), time.Since(st))
switch pc.ConnectionState() {
case webrtc.PeerConnectionStateConnected:
once.Do(func() { close(errC) })
Expand All @@ -341,13 +338,12 @@ func addOnConnectionStateChangeCallback(pc *webrtc.PeerConnection, side string)
errC <- errors.New("peerconnection failed")
close(errC)
})
log.Error("peer connection failed")
case webrtc.PeerConnectionStateDisconnected:
// the connection can move to a disconnected state and back to a connected state without ICE renegotiation.
// This could happen when underlying UDP packets are lost, and therefore the connection moves to the disconnected state.
// If the connection then receives packets on the connection, it can move back to the connected state.
// If no packets are received until the failed timeout is triggered, the connection moves to the failed state.
log.Error("peerconnection disconnected")
log.Warn("peerconnection disconnected")
}
})
return errC
Expand Down
8 changes: 4 additions & 4 deletions p2p/transport/webrtc/transport.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ const (
// timeout values for the peerconnection
// https://github.com/pion/webrtc/blob/v3.1.50/settingengine.go#L102-L109
const (
DefaultDisconnectedTimeout = 60 * time.Second
DefaultFailedTimeout = 60 * time.Second
DefaultKeepaliveTimeout = 60 * time.Second
DefaultDisconnectedTimeout = 20 * time.Second
DefaultFailedTimeout = 30 * time.Second
DefaultKeepaliveTimeout = 15 * time.Second

sctpReceiveBufferSize = 100_000
)
Expand Down Expand Up @@ -327,7 +327,7 @@ func (t *WebRTCTransport) dial(ctx context.Context, scope network.ConnManagement
return nil, fmt.Errorf("instantiating peer connection failed: %w", err)
}

errC := addOnConnectionStateChangeCallback(w.PeerConnection, "dialer")
errC := addOnConnectionStateChangeCallback(w.PeerConnection)

// do offer-answer exchange
offer, err := w.PeerConnection.CreateOffer(nil)
Expand Down
2 changes: 1 addition & 1 deletion test-plans/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ require (
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pion/datachannel v1.5.6 // indirect
github.com/pion/dtls/v2 v2.2.11 // indirect
github.com/pion/ice/v2 v2.3.24 // indirect
github.com/pion/ice/v2 v2.3.25 // indirect
github.com/pion/interceptor v0.1.29 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.12 // indirect
Expand Down
4 changes: 2 additions & 2 deletions test-plans/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ github.com/pion/datachannel v1.5.6/go.mod h1:1eKT6Q85pRnr2mHiWHxJwO50SfZRtWHTsNI
github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
github.com/pion/dtls/v2 v2.2.11 h1:9U/dpCYl1ySttROPWJgqWKEylUdT0fXp/xst6JwY5Ks=
github.com/pion/dtls/v2 v2.2.11/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE=
github.com/pion/ice/v2 v2.3.24 h1:RYgzhH/u5lH0XO+ABatVKCtRd+4U1GEaCXSMjNr13tI=
github.com/pion/ice/v2 v2.3.24/go.mod h1:KXJJcZK7E8WzrBEYnV4UtqEZsGeWfHxsNqhVcVvgjxw=
github.com/pion/ice/v2 v2.3.25 h1:M5rJA07dqhi3nobJIg+uPtcVjFECTrhcR3n0ns8kDZs=
github.com/pion/ice/v2 v2.3.25/go.mod h1:KXJJcZK7E8WzrBEYnV4UtqEZsGeWfHxsNqhVcVvgjxw=
github.com/pion/interceptor v0.1.29 h1:39fsnlP1U8gw2JzOFWdfCU82vHvhW9o0rZnZF56wF+M=
github.com/pion/interceptor v0.1.29/go.mod h1:ri+LGNjRUc5xUNtDEPzfdkmSqISixVTBF/z/Zms/6T4=
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
Expand Down

0 comments on commit 8a6b544

Please sign in to comment.