mirror of
https://github.com/netbirdio/ice.git
synced 2026-05-22 17:10:58 -07:00
Use merged pion/stun instead of gortc/stun
The only thing that should be changed after complete merge is version
This commit is contained in:
committed by
Sean DuBois
parent
7b33f85353
commit
35330ae9e7
@@ -11,8 +11,8 @@ import (
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/logging"
|
||||
"github.com/pion/stun"
|
||||
"github.com/pion/transport/packetio"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -6,8 +6,8 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/logging"
|
||||
"github.com/pion/stun"
|
||||
"github.com/pion/transport/test"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package ice
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
func newCandidatePair(local, remote *Candidate, controlling bool) *candidatePair {
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
func localInterfaces(networkTypes []NetworkType) (ips []net.IP) {
|
||||
|
||||
@@ -3,8 +3,8 @@ module github.com/pion/ice
|
||||
go 1.12
|
||||
|
||||
require (
|
||||
github.com/gortc/stun v1.19.0
|
||||
github.com/pion/logging v0.2.1
|
||||
github.com/pion/stun v0.2.3-0.20190521105836-be7bc5d4a230
|
||||
github.com/pion/transport v0.7.0
|
||||
github.com/stretchr/testify v1.3.0
|
||||
)
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/gortc/stun v1.19.0 h1:6qy7zGGk0tdMOdEzK7hLeAVZEHllJC8+OOBpPAyjY1c=
|
||||
github.com/gortc/stun v1.19.0/go.mod h1:dZ0O/fYCkg9Z0Pvl6WDpNhRFTAU0X1CPOsJiZqn6EHo=
|
||||
github.com/pion/logging v0.2.1 h1:LwASkBKZ+2ysGJ+jLv1E/9H1ge0k1nTfi1X+5zirkDk=
|
||||
github.com/pion/logging v0.2.1/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
|
||||
github.com/pion/stun v0.2.3-0.20190521105836-be7bc5d4a230 h1:UABEGI/irK/3t/Fz1yCBSY59JKVOYULfLP1GT24WS5U=
|
||||
github.com/pion/stun v0.2.3-0.20190521105836-be7bc5d4a230/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M=
|
||||
github.com/pion/transport v0.7.0 h1:EsXN8TglHMlKZMo4ZGqwK6QgXBu0WYg7wfGMWIXsS+w=
|
||||
github.com/pion/transport v0.7.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE=
|
||||
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package ice
|
||||
|
||||
import "github.com/gortc/stun"
|
||||
import "github.com/pion/stun"
|
||||
|
||||
// tiebreaker is common helper for ICE-{CONTROLLED,CONTROLLING}
|
||||
// and represents the so-called tiebreaker number.
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package ice
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
func TestControlled_GetFrom(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package ice
|
||||
|
||||
import "github.com/gortc/stun"
|
||||
import "github.com/pion/stun"
|
||||
|
||||
// PriorityAttr represents PRIORITY attribute.
|
||||
type PriorityAttr uint32
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package ice
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
func TestPriority_GetFrom(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -3,8 +3,8 @@ package ice
|
||||
import (
|
||||
"net"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/logging"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
type pairCandidateSelector interface {
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"encoding/binary"
|
||||
"fmt"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
// bin is shorthand for BigEndian.
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import (
|
||||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
// Dial connects to the remote agent, acting as the controlling ice agent.
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package ice
|
||||
|
||||
import "github.com/gortc/stun"
|
||||
import "github.com/pion/stun"
|
||||
|
||||
// UseCandidateAttr represents USE-CANDIDATE attribute.
|
||||
type UseCandidateAttr struct{}
|
||||
|
||||
@@ -3,7 +3,7 @@ package ice
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/gortc/stun"
|
||||
"github.com/pion/stun"
|
||||
)
|
||||
|
||||
func TestUseCandidateAttr_AddTo(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user