Remove unportable code from internal/ipnet

Upgraded pion/transport to v0.8.6 Relates to pion/webrtc#740
pion · Jul 17, 2019 · e6c745d · e6c745d
1 parent 62b9d71
commit e6c745d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 159 deletions.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/gortc/turn v0.8.0
 	github.com/pion/logging v0.2.2
 	github.com/pion/stun v0.3.1
-	github.com/pion/transport v0.8.5
+	github.com/pion/transport v0.8.6
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/net v0.0.0-20190403144856-b630fd6fe46b

diff --git a/go.sum b/go.sum
@@ -9,8 +9,8 @@ github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
 github.com/pion/stun v0.3.1 h1:d09JJzOmOS8ZzIp8NppCMgrxGZpJ4Ix8qirfNYyI3BA=
 github.com/pion/stun v0.3.1/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M=
-github.com/pion/transport v0.8.5 h1:uo7g9BH6+Nm7DaJ1qX8+sv1o5rYREIM41kzrPVQYg14=
-github.com/pion/transport v0.8.5/go.mod h1:nAmRRnn+ArVtsoNuwktvAD+jrjSD7pA+H3iRmZwdUno=
+github.com/pion/transport v0.8.6 h1:xHQq2mxAjB+UrFs90aUBaXwlmIACfQAZnOiVAX3uqMw=
+github.com/pion/transport v0.8.6/go.mod h1:nAmRRnn+ArVtsoNuwktvAD+jrjSD7pA+H3iRmZwdUno=
 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=

diff --git a/internal/allocation/allocation_manager_test.go b/internal/allocation/allocation_manager_test.go
@@ -10,13 +10,12 @@ import (
 
 	"github.com/gortc/turn"
 	"github.com/pion/logging"
-	"github.com/pion/turn/internal/ipnet"
 )
 
 func TestManager(t *testing.T) {
 	tt := []struct {
 		name string
-		f    func(*testing.T, ipnet.PacketConn)
+		f    func(*testing.T, net.PacketConn)
 	}{
 		{"CreateInvalidAllocation", subTestCreateInvalidAllocation},
 		{"CreateAllocation", subTestCreateAllocation},
@@ -27,16 +26,11 @@ func TestManager(t *testing.T) {
 	}
 
 	network := "udp4"
-	c, err := net.ListenPacket(network, "0.0.0.0:0")
+	turnSocket, err := net.ListenPacket(network, "0.0.0.0:0")
 	if err != nil {
 		panic(err)
 	}
 
-	turnSocket, err := ipnet.NewPacketConn(network, c)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	for _, tc := range tt {
 		f := tc.f
 		t.Run(tc.name, func(t *testing.T) {
@@ -46,7 +40,7 @@ func TestManager(t *testing.T) {
 }
 
 // test invalid Allocation creations
-func subTestCreateInvalidAllocation(t *testing.T, turnSocket ipnet.PacketConn) {
+func subTestCreateInvalidAllocation(t *testing.T, turnSocket net.PacketConn) {
 	m := newTestManager()
 	if a, err := m.CreateAllocation(nil, turnSocket, net.IPv4zero, 0, turn.DefaultLifetime); a != nil || err == nil {
 		t.Errorf("Illegally created allocation with nil FiveTuple")
@@ -60,7 +54,7 @@ func subTestCreateInvalidAllocation(t *testing.T, turnSocket ipnet.PacketConn) {
 }
 
 // test valid Allocation creations
-func subTestCreateAllocation(t *testing.T, turnSocket ipnet.PacketConn) {
+func subTestCreateAllocation(t *testing.T, turnSocket net.PacketConn) {
 	m := newTestManager()
 	fiveTuple := randomFiveTuple()
 	if a, err := m.CreateAllocation(fiveTuple, turnSocket, net.IPv4zero, 0, turn.DefaultLifetime); a == nil || err != nil {
@@ -73,7 +67,7 @@ func subTestCreateAllocation(t *testing.T, turnSocket ipnet.PacketConn) {
 }
 
 // test that two allocations can't be created with the same FiveTuple
-func subTestCreateAllocationDuplicateFiveTuple(t *testing.T, turnSocket ipnet.PacketConn) {
+func subTestCreateAllocationDuplicateFiveTuple(t *testing.T, turnSocket net.PacketConn) {
 	m := newTestManager()
 	fiveTuple := randomFiveTuple()
 	if a, err := m.CreateAllocation(fiveTuple, turnSocket, net.IPv4zero, 0, turn.DefaultLifetime); a == nil || err != nil {
@@ -85,7 +79,7 @@ func subTestCreateAllocationDuplicateFiveTuple(t *testing.T, turnSocket ipnet.Pa
 	}
 }
 
-func subTestDeleteAllocation(t *testing.T, turnSocket ipnet.PacketConn) {
+func subTestDeleteAllocation(t *testing.T, turnSocket net.PacketConn) {
 	m := newTestManager()
 	fiveTuple := randomFiveTuple()
 	if a, err := m.CreateAllocation(fiveTuple, turnSocket, net.IPv4zero, 0, turn.DefaultLifetime); a == nil || err != nil {
@@ -103,7 +97,7 @@ func subTestDeleteAllocation(t *testing.T, turnSocket ipnet.PacketConn) {
 }
 
 // test that allocation should be closed if timeout
-func subTestAllocationTimeout(t *testing.T, turnSocket ipnet.PacketConn) {
+func subTestAllocationTimeout(t *testing.T, turnSocket net.PacketConn) {
 	m := newTestManager()
 	allocations := make([]*Allocation, 5)
 	lifetime := time.Second
@@ -129,7 +123,7 @@ func subTestAllocationTimeout(t *testing.T, turnSocket ipnet.PacketConn) {
 }
 
 // test for manager close
-func subTestManagerClose(t *testing.T, turnSocket ipnet.PacketConn) {
+func subTestManagerClose(t *testing.T, turnSocket net.PacketConn) {
 	m := newTestManager()
 	allocations := make([]*Allocation, 2)
 

diff --git a/internal/ipnet/controlmessage.go b/internal/ipnet/controlmessage.go
diff --git a/internal/ipnet/ipv4.go b/internal/ipnet/ipv4.go
diff --git a/internal/ipnet/ipv4_unix.go b/internal/ipnet/ipv4_unix.go
diff --git a/internal/ipnet/ipv4_windows.go b/internal/ipnet/ipv4_windows.go
diff --git a/internal/ipnet/packetconn.go b/internal/ipnet/packetconn.go