Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Update module transport, srtp, ice and turn" #2572

Merged
merged 1 commit into from
Sep 8, 2023
Merged

Revert "Update module transport, srtp, ice and turn" #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion datachannel_go_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/pion/datachannel"
"github.com/pion/logging"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion datachannel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion dtlstransport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pion/interceptor"
"github.com/pion/logging"
"github.com/pion/rtcp"
"github.com/pion/srtp/v3"
"github.com/pion/srtp/v2"
"github.com/pion/webrtc/v3/internal/mux"
"github.com/pion/webrtc/v3/internal/util"
"github.com/pion/webrtc/v3/pkg/rtcerr"
Expand Down
2 changes: 1 addition & 1 deletion dtlstransport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/ice-single-port/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"net/http"
"time"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/pion/webrtc/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/vnet/show-network-usage/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

"github.com/pion/logging"
"github.com/pion/transport/v3/vnet"
"github.com/pion/transport/v2/vnet"
"github.com/pion/webrtc/v3"
)

Expand Down
7 changes: 3 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@ require (
github.com/onsi/gomega v1.17.0 // indirect
github.com/pion/datachannel v1.5.5
github.com/pion/dtls/v2 v2.2.7
github.com/pion/ice/v3 v3.0.0
github.com/pion/ice/v2 v2.3.11
github.com/pion/interceptor v0.1.18
github.com/pion/logging v0.2.2
github.com/pion/randutil v0.1.0
github.com/pion/rtcp v1.2.10
github.com/pion/rtp v1.8.1
github.com/pion/sctp v1.8.8
github.com/pion/sdp/v3 v3.0.6
github.com/pion/srtp/v3 v3.0.0
github.com/pion/srtp/v2 v2.0.17
github.com/pion/stun v0.6.1
github.com/pion/transport/v2 v2.2.3 // indirect
github.com/pion/transport/v3 v3.0.1
github.com/pion/transport/v2 v2.2.3
github.com/sclevine/agouti v3.0.0+incompatible
github.com/stretchr/testify v1.8.4
golang.org/x/net v0.14.0
Expand Down
15 changes: 6 additions & 9 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew
github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0=
github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8=
github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
github.com/pion/ice/v3 v3.0.0 h1:7bnFWQNIJqabCp111sMIbo4dOjRMLzpf4qhWEadf9IY=
github.com/pion/ice/v3 v3.0.0/go.mod h1:PTKU5KYRIlBTvrj1fh1PiY3z4YsMiC/AECGJqMwFSxI=
github.com/pion/ice/v2 v2.3.11 h1:rZjVmUwyT55cmN8ySMpL7rsS8KYsJERsrxJLLxpKhdw=
github.com/pion/ice/v2 v2.3.11/go.mod h1:hPcLC3kxMa+JGRzMHqQzjoSj3xtE9F+eoncmXLlCL4E=
github.com/pion/interceptor v0.1.18 h1:Hk26334NUQeUcJNR27YHYKT+sWNhhegQ9KFz5Nn6yMQ=
github.com/pion/interceptor v0.1.18/go.mod h1:tpvvF4cPM6NGxFA1DUMbhabzQBxdWMATDGEUYOR9x6I=
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
Expand All @@ -63,8 +63,8 @@ github.com/pion/sctp v1.8.8 h1:5EdnnKI4gpyR1a1TwbiS/wxEgcUWBHsc7ILAjARJB+U=
github.com/pion/sctp v1.8.8/go.mod h1:igF9nZBrjh5AtmKc7U30jXltsFHicFCXSmWA2GWRaWs=
github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw=
github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
github.com/pion/srtp/v3 v3.0.0 h1:dH5nZUTxN+JDu4otle8Dfh5E/MHR6m8/aib7eD22QDc=
github.com/pion/srtp/v3 v3.0.0/go.mod h1:WxJGk0scShe0UdUidDgR0kDHywX7JN83JOYPkYiLdpM=
github.com/pion/srtp/v2 v2.0.17 h1:ECuOk+7uIpY6HUlTb0nXhfvu4REG2hjtC4ronYFCZE4=
github.com/pion/srtp/v2 v2.0.17/go.mod h1:y5WSHcJY4YfNB/5r7ca5YjHeIr1H3LM1rKArGGs8jMc=
github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4=
github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8=
github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40=
Expand All @@ -73,11 +73,8 @@ github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1A
github.com/pion/transport/v2 v2.2.2/go.mod h1:OJg3ojoBJopjEeECq2yJdXH9YVrUJ1uQ++NjXLOUorc=
github.com/pion/transport/v2 v2.2.3 h1:XcOE3/x41HOSKbl1BfyY1TF1dERx7lVvlMCbXU7kfvA=
github.com/pion/transport/v2 v2.2.3/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
github.com/pion/transport/v3 v3.0.0/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0=
github.com/pion/transport/v3 v3.0.1 h1:gDTlPJwROfSfz6QfSi0ZmeCSkFcnWWiiR9ES0ouANiM=
github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0=
github.com/pion/turn/v3 v3.0.0 h1:zafXa25ZWmiUYRi4JlnAsUhCDoFfF7YMYWnosvK5vBk=
github.com/pion/turn/v3 v3.0.0/go.mod h1:z4ih3T0zTERgNSEJRa2QHBNcbB3SOtTYsr5LH0pil6Q=
github.com/pion/turn/v2 v2.1.3 h1:pYxTVWG2gpC97opdRc5IGsQ1lJ9O/IlNhkzj7MMrGAA=
github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sclevine/agouti v3.0.0+incompatible h1:8IBJS6PWz3uTlMP3YBIR5f+KAldcGuOeFkFbUWfBgK4=
Expand Down
2 changes: 1 addition & 1 deletion icecandidate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package webrtc
import (
"fmt"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
)

// ICECandidate represents a ice candidate
Expand Down
2 changes: 1 addition & 1 deletion icecandidate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package webrtc
import (
"testing"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion icecandidatetype.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package webrtc
import (
"fmt"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
)

// ICECandidateType represents the type of the ICE candidate used.
Expand Down
2 changes: 1 addition & 1 deletion icegatherer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync"
"sync/atomic"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/pion/logging"
"github.com/pion/stun"
)
Expand Down
4 changes: 2 additions & 2 deletions icegatherer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"testing"
"time"

"github.com/pion/ice/v3"
"github.com/pion/transport/v3/test"
"github.com/pion/ice/v2"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion icemux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package webrtc
import (
"net"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/pion/logging"
)

Expand Down
2 changes: 1 addition & 1 deletion iceserver_js.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package webrtc
import (
"errors"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
)

// ICEServer describes a single STUN and TURN server that can be used by
Expand Down
2 changes: 1 addition & 1 deletion icetransport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sync/atomic"
"time"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/pion/logging"
"github.com/pion/webrtc/v3/internal/mux"
)
Expand Down
2 changes: 1 addition & 1 deletion icetransport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion icetransportstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package webrtc

import "github.com/pion/ice/v3"
import "github.com/pion/ice/v2"

// ICETransportState represents the current state of the ICE transport.
type ICETransportState int
Expand Down
2 changes: 1 addition & 1 deletion icetransportstate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package webrtc
import (
"testing"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion interceptor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/pion/interceptor"
mock_interceptor "github.com/pion/interceptor/pkg/mock"
"github.com/pion/rtp"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/pion/webrtc/v3/pkg/media"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/mux/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net"
"time"

"github.com/pion/ice/v3"
"github.com/pion/transport/v3/packetio"
"github.com/pion/ice/v2"
"github.com/pion/transport/v2/packetio"
)

// Endpoint implements net.Conn. It is used to read muxed packets.
Expand Down
4 changes: 2 additions & 2 deletions internal/mux/mux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"net"
"sync"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/pion/logging"
"github.com/pion/transport/v3/packetio"
"github.com/pion/transport/v2/packetio"
)

// The maximum amount of data that can be buffered before returning errors.
Expand Down
4 changes: 2 additions & 2 deletions internal/mux/mux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"time"

"github.com/pion/logging"
"github.com/pion/transport/v3/packetio"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/packetio"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion mediaengine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"testing"

"github.com/pion/sdp/v3"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion networktype.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package webrtc
import (
"fmt"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
)

func supportedNetworkTypes() []NetworkType {
Expand Down
2 changes: 1 addition & 1 deletion ortc_datachannel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion ortc_media_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/pion/webrtc/v3/pkg/media"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions peerconnection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (
"sync/atomic"
"time"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/pion/interceptor"
"github.com/pion/logging"
"github.com/pion/rtcp"
"github.com/pion/sdp/v3"
"github.com/pion/srtp/v3"
"github.com/pion/srtp/v2"
"github.com/pion/webrtc/v3/internal/util"
"github.com/pion/webrtc/v3/pkg/rtcerr"
)
Expand Down
2 changes: 1 addition & 1 deletion peerconnection_close_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions peerconnection_go_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"testing"
"time"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/pion/rtp"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v3/vnet"
"github.com/pion/transport/v2/test"
"github.com/pion/transport/v2/vnet"
"github.com/pion/webrtc/v3/internal/util"
"github.com/pion/webrtc/v3/pkg/rtcerr"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion peerconnection_js.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package webrtc
import (
"syscall/js"

"github.com/pion/ice/v3"
"github.com/pion/ice/v2"
"github.com/pion/webrtc/v3/pkg/rtcerr"
)

Expand Down
2 changes: 1 addition & 1 deletion peerconnection_media_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/pion/rtcp"
"github.com/pion/rtp"
"github.com/pion/sdp/v3"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/pion/webrtc/v3/pkg/media"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion peerconnection_renegotiation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

"github.com/pion/rtp"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/pion/webrtc/v3/internal/util"
"github.com/pion/webrtc/v3/pkg/media"
"github.com/pion/webrtc/v3/pkg/rtcerr"
Expand Down
2 changes: 1 addition & 1 deletion peerconnection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/pion/sdp/v3"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/pion/webrtc/v3/pkg/rtcerr"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion rtpreceiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/pion/interceptor"
"github.com/pion/rtcp"
"github.com/pion/srtp/v3"
"github.com/pion/srtp/v2"
"github.com/pion/webrtc/v3/internal/util"
)

Expand Down
2 changes: 1 addition & 1 deletion rtpreceiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/pion/webrtc/v3/pkg/media"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion rtpsender_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"
"time"

"github.com/pion/transport/v3/test"
"github.com/pion/transport/v2/test"
"github.com/pion/webrtc/v3/pkg/media"
"github.com/stretchr/testify/assert"
)
Expand Down