From 8202520b928576d43cbcc1b579b565141eac3040 Mon Sep 17 00:00:00 2001 From: Sean DuBois Date: Mon, 12 Aug 2024 11:26:26 -0400 Subject: [PATCH] Update module github.com/pion/stun/v3 to v3.0.0 --- client.go | 6 +- client_test.go | 4 +- examples/lt-cred-generator/main.go | 2 +- examples/stun-only-server/main.go | 2 +- examples/turn-client/tcp-alloc/main.go | 2 +- examples/turn-client/tcp/main.go | 2 +- examples/turn-client/udp/main.go | 2 +- .../add-software-attribute/main.go | 4 +- examples/turn-server/log/main.go | 4 +- .../turn-server/lt-cred-turn-rest/main.go | 2 +- examples/turn-server/lt-cred/main.go | 2 +- examples/turn-server/perm-filter/main.go | 2 +- examples/turn-server/port-range/main.go | 2 +- .../turn-server/simple-multithreaded/main.go | 2 +- examples/turn-server/simple/main.go | 2 +- examples/turn-server/tcp/main.go | 2 +- examples/turn-server/tls/main.go | 2 +- go.mod | 9 ++- go.sum | 67 ++----------------- internal/allocation/allocation.go | 6 +- .../allocation/allocation_manager_test.go | 2 +- internal/allocation/allocation_test.go | 6 +- internal/allocation/channel_bind.go | 2 +- internal/allocation/channel_bind_test.go | 2 +- internal/client/allocation.go | 4 +- internal/client/client.go | 2 +- internal/client/client_test.go | 2 +- internal/client/permission.go | 2 +- internal/client/tcp_alloc.go | 4 +- internal/client/tcp_conn.go | 2 +- internal/client/tcp_conn_test.go | 4 +- internal/client/transaction.go | 2 +- internal/client/udp_conn.go | 4 +- internal/client/udp_conn_test.go | 2 +- internal/proto/chann.go | 2 +- internal/proto/chann_test.go | 2 +- internal/proto/chrome_test.go | 2 +- internal/proto/connection_id.go | 2 +- internal/proto/data.go | 2 +- internal/proto/data_test.go | 2 +- internal/proto/dontfrag.go | 2 +- internal/proto/dontfrag_test.go | 2 +- internal/proto/evenport.go | 2 +- internal/proto/evenport_test.go | 2 +- internal/proto/fuzz_test.go | 2 +- internal/proto/lifetime.go | 2 +- internal/proto/lifetime_test.go | 2 +- internal/proto/peeraddr.go | 2 +- internal/proto/peeraddr_test.go | 2 +- internal/proto/proto.go | 2 +- internal/proto/relayedaddr.go | 2 +- internal/proto/relayedaddr_test.go | 2 +- internal/proto/reqfamily.go | 2 +- internal/proto/reqfamily_test.go | 2 +- internal/proto/reqtrans.go | 2 +- internal/proto/reqtrans_test.go | 2 +- internal/proto/rsrvtoken.go | 2 +- internal/proto/rsrvtoken_test.go | 2 +- internal/server/server.go | 6 +- internal/server/stun.go | 4 +- internal/server/turn.go | 8 +-- internal/server/turn_test.go | 6 +- internal/server/util.go | 4 +- server.go | 6 +- server_test.go | 4 +- stun_conn.go | 4 +- 66 files changed, 100 insertions(+), 156 deletions(-) diff --git a/client.go b/client.go index eaa811d6..6e38ae10 100644 --- a/client.go +++ b/client.go @@ -12,11 +12,11 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/pion/transport/v3" "github.com/pion/transport/v3/stdnet" - "github.com/pion/turn/v3/internal/client" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/client" + "github.com/pion/turn/v4/internal/proto" ) const ( diff --git a/client_test.go b/client_test.go index ec50b14c..0627b95e 100644 --- a/client_test.go +++ b/client_test.go @@ -12,8 +12,8 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/lt-cred-generator/main.go b/examples/lt-cred-generator/main.go index f9d50bb1..fc5ea527 100644 --- a/examples/lt-cred-generator/main.go +++ b/examples/lt-cred-generator/main.go @@ -12,7 +12,7 @@ import ( "os" "time" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) // Outputs username & password according to the diff --git a/examples/stun-only-server/main.go b/examples/stun-only-server/main.go index 5cba2997..da10e582 100644 --- a/examples/stun-only-server/main.go +++ b/examples/stun-only-server/main.go @@ -13,7 +13,7 @@ import ( "strconv" "syscall" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-client/tcp-alloc/main.go b/examples/turn-client/tcp-alloc/main.go index c52ecff8..1fee091d 100644 --- a/examples/turn-client/tcp-alloc/main.go +++ b/examples/turn-client/tcp-alloc/main.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/pion/logging" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func setupSignalingChannel(addrCh chan string, signaling bool, relayAddr string) { diff --git a/examples/turn-client/tcp/main.go b/examples/turn-client/tcp/main.go index f73a2021..f7a7ec1d 100644 --- a/examples/turn-client/tcp/main.go +++ b/examples/turn-client/tcp/main.go @@ -13,7 +13,7 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-client/udp/main.go b/examples/turn-client/udp/main.go index e80a2898..d53ea8f7 100644 --- a/examples/turn-client/udp/main.go +++ b/examples/turn-client/udp/main.go @@ -13,7 +13,7 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-server/add-software-attribute/main.go b/examples/turn-server/add-software-attribute/main.go index 1e47058e..bffeb1e9 100644 --- a/examples/turn-server/add-software-attribute/main.go +++ b/examples/turn-server/add-software-attribute/main.go @@ -15,8 +15,8 @@ import ( "strconv" "syscall" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4" ) // attributeAdder wraps a PacketConn and appends the SOFTWARE attribute to STUN packets diff --git a/examples/turn-server/log/main.go b/examples/turn-server/log/main.go index 2298abc7..fc974e07 100644 --- a/examples/turn-server/log/main.go +++ b/examples/turn-server/log/main.go @@ -15,8 +15,8 @@ import ( "strconv" "syscall" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4" ) // stunLogger wraps a PacketConn and prints incoming/outgoing STUN packets diff --git a/examples/turn-server/lt-cred-turn-rest/main.go b/examples/turn-server/lt-cred-turn-rest/main.go index b85e8061..655cdbc3 100644 --- a/examples/turn-server/lt-cred-turn-rest/main.go +++ b/examples/turn-server/lt-cred-turn-rest/main.go @@ -15,7 +15,7 @@ import ( "syscall" "github.com/pion/logging" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-server/lt-cred/main.go b/examples/turn-server/lt-cred/main.go index 3fa81dfa..b05d2aa3 100644 --- a/examples/turn-server/lt-cred/main.go +++ b/examples/turn-server/lt-cred/main.go @@ -18,7 +18,7 @@ import ( "syscall" "github.com/pion/logging" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-server/perm-filter/main.go b/examples/turn-server/perm-filter/main.go index 11139029..ab2c24b8 100644 --- a/examples/turn-server/perm-filter/main.go +++ b/examples/turn-server/perm-filter/main.go @@ -18,7 +18,7 @@ import ( "strings" "syscall" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-server/port-range/main.go b/examples/turn-server/port-range/main.go index 5d89e994..9ed536ed 100644 --- a/examples/turn-server/port-range/main.go +++ b/examples/turn-server/port-range/main.go @@ -15,7 +15,7 @@ import ( "strconv" "syscall" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-server/simple-multithreaded/main.go b/examples/turn-server/simple-multithreaded/main.go index acae7e59..fb89473c 100644 --- a/examples/turn-server/simple-multithreaded/main.go +++ b/examples/turn-server/simple-multithreaded/main.go @@ -17,7 +17,7 @@ import ( "strconv" "syscall" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" "golang.org/x/sys/unix" ) diff --git a/examples/turn-server/simple/main.go b/examples/turn-server/simple/main.go index d2ba7d7c..294b76a5 100644 --- a/examples/turn-server/simple/main.go +++ b/examples/turn-server/simple/main.go @@ -14,7 +14,7 @@ import ( "strconv" "syscall" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-server/tcp/main.go b/examples/turn-server/tcp/main.go index 9a6ab47b..ef3d147c 100644 --- a/examples/turn-server/tcp/main.go +++ b/examples/turn-server/tcp/main.go @@ -14,7 +14,7 @@ import ( "strconv" "syscall" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/examples/turn-server/tls/main.go b/examples/turn-server/tls/main.go index 61823086..5d9d971c 100644 --- a/examples/turn-server/tls/main.go +++ b/examples/turn-server/tls/main.go @@ -15,7 +15,7 @@ import ( "strconv" "syscall" - "github.com/pion/turn/v3" + "github.com/pion/turn/v4" ) func main() { diff --git a/go.mod b/go.mod index cf1e41ba..c3f83f52 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ -module github.com/pion/turn/v3 +module github.com/pion/turn/v4 go 1.19 require ( github.com/pion/logging v0.2.2 github.com/pion/randutil v0.1.0 - github.com/pion/stun/v2 v2.0.0 + github.com/pion/stun/v3 v3.0.0 github.com/pion/transport/v3 v3.0.7 github.com/stretchr/testify v1.9.0 golang.org/x/sys v0.22.0 @@ -13,10 +13,9 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/pion/dtls/v2 v2.2.7 // indirect - github.com/pion/transport/v2 v2.2.1 // indirect + github.com/pion/dtls/v3 v3.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/wlynxg/anet v0.0.3 // indirect - golang.org/x/crypto v0.21.0 // indirect + golang.org/x/crypto v0.25.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index a3aa6b5a..8092847b 100644 --- a/go.sum +++ b/go.sum @@ -1,82 +1,27 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -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/dtls/v3 v3.0.1 h1:0kmoaPYLAo0md/VemjcrAXQiSf8U+tuU3nDYVNpEKaw= +github.com/pion/dtls/v3 v3.0.1/go.mod h1:dfIXcFkKoujDQ+jtd8M6RgqKK3DuaUilm3YatAbGp5k= 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/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/stun/v2 v2.0.0 h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0= -github.com/pion/stun/v2 v2.0.0/go.mod h1:22qRSh08fSEttYUmJZGlriq9+03jtVmXNODgLccj8GQ= -github.com/pion/transport/v2 v2.2.1 h1:7qYnCBlpgSJNYMbLCKuSY9KbQdBFoETvPNETv0y4N7c= -github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= -github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0= +github.com/pion/stun/v3 v3.0.0 h1:4h1gwhWLWuZWOJIJR9s2ferRO+W3zA/b6ijOI6mKzUw= +github.com/pion/stun/v3 v3.0.0/go.mod h1:HvCN8txt8mwi4FBvS3EmDghW6aQJ24T+y+1TKjB5jyU= github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0= github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo= 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= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/wlynxg/anet v0.0.3 h1:PvR53psxFXstc12jelG6f1Lv4MWqE0tI76/hHGjh9rg= github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/allocation/allocation.go b/internal/allocation/allocation.go index 9e542fb3..5b5ff369 100644 --- a/internal/allocation/allocation.go +++ b/internal/allocation/allocation.go @@ -11,9 +11,9 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/ipnet" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/ipnet" + "github.com/pion/turn/v4/internal/proto" ) type allocationResponse struct { diff --git a/internal/allocation/allocation_manager_test.go b/internal/allocation/allocation_manager_test.go index 5ebfe68b..014d85d3 100644 --- a/internal/allocation/allocation_manager_test.go +++ b/internal/allocation/allocation_manager_test.go @@ -15,7 +15,7 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/proto" "github.com/stretchr/testify/assert" ) diff --git a/internal/allocation/allocation_test.go b/internal/allocation/allocation_test.go index 70c383a2..49269d68 100644 --- a/internal/allocation/allocation_test.go +++ b/internal/allocation/allocation_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/ipnet" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/ipnet" + "github.com/pion/turn/v4/internal/proto" "github.com/stretchr/testify/assert" ) diff --git a/internal/allocation/channel_bind.go b/internal/allocation/channel_bind.go index b096fcd4..19b18431 100644 --- a/internal/allocation/channel_bind.go +++ b/internal/allocation/channel_bind.go @@ -8,7 +8,7 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/proto" ) // ChannelBind represents a TURN Channel diff --git a/internal/allocation/channel_bind_test.go b/internal/allocation/channel_bind_test.go index 342e7612..30e3034a 100644 --- a/internal/allocation/channel_bind_test.go +++ b/internal/allocation/channel_bind_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/proto" ) func TestChannelBind(t *testing.T) { diff --git a/internal/client/allocation.go b/internal/client/allocation.go index 49b09b63..a7f74636 100644 --- a/internal/client/allocation.go +++ b/internal/client/allocation.go @@ -11,9 +11,9 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/pion/transport/v3" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/proto" ) // AllocationConfig is a set of configuration params use by NewUDPConn and NewTCPAllocation diff --git a/internal/client/client.go b/internal/client/client.go index 615da808..10b49a28 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -7,7 +7,7 @@ package client import ( "net" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // Client is an interface for the public turn.Client in order to break cyclic dependencies diff --git a/internal/client/client_test.go b/internal/client/client_test.go index c544c8a5..95d68c90 100644 --- a/internal/client/client_test.go +++ b/internal/client/client_test.go @@ -6,7 +6,7 @@ package client import ( "net" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) type mockClient struct { diff --git a/internal/client/permission.go b/internal/client/permission.go index b9798756..0436e4ea 100644 --- a/internal/client/permission.go +++ b/internal/client/permission.go @@ -8,7 +8,7 @@ import ( "sync" "sync/atomic" - "github.com/pion/turn/v3/internal/ipnet" + "github.com/pion/turn/v4/internal/ipnet" ) type permState int32 diff --git a/internal/client/tcp_alloc.go b/internal/client/tcp_alloc.go index f6f8b4c8..82948387 100644 --- a/internal/client/tcp_alloc.go +++ b/internal/client/tcp_alloc.go @@ -11,9 +11,9 @@ import ( "net" "time" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/pion/transport/v3" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/proto" ) var ( diff --git a/internal/client/tcp_conn.go b/internal/client/tcp_conn.go index faed98bb..990b6d42 100644 --- a/internal/client/tcp_conn.go +++ b/internal/client/tcp_conn.go @@ -8,7 +8,7 @@ import ( "net" "github.com/pion/transport/v3" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/proto" ) var ( diff --git a/internal/client/tcp_conn_test.go b/internal/client/tcp_conn_test.go index e0f2777d..b7ef6d8c 100644 --- a/internal/client/tcp_conn_test.go +++ b/internal/client/tcp_conn_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/pion/transport/v3" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/proto" "github.com/stretchr/testify/assert" ) diff --git a/internal/client/transaction.go b/internal/client/transaction.go index 6031d6c3..b1c9105e 100644 --- a/internal/client/transaction.go +++ b/internal/client/transaction.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) const ( diff --git a/internal/client/udp_conn.go b/internal/client/udp_conn.go index 82b0f73c..7bb18765 100644 --- a/internal/client/udp_conn.go +++ b/internal/client/udp_conn.go @@ -12,8 +12,8 @@ import ( "net" "time" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/proto" ) const ( diff --git a/internal/client/udp_conn_test.go b/internal/client/udp_conn_test.go index ee7ef7fc..889ffe4b 100644 --- a/internal/client/udp_conn_test.go +++ b/internal/client/udp_conn_test.go @@ -7,7 +7,7 @@ import ( "net" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/stretchr/testify/assert" ) diff --git a/internal/proto/chann.go b/internal/proto/chann.go index 5bf92579..3aeb59f3 100644 --- a/internal/proto/chann.go +++ b/internal/proto/chann.go @@ -8,7 +8,7 @@ import ( "errors" "strconv" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // ChannelNumber represents CHANNEL-NUMBER attribute. diff --git a/internal/proto/chann_test.go b/internal/proto/chann_test.go index 1a32f257..04c85fda 100644 --- a/internal/proto/chann_test.go +++ b/internal/proto/chann_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/stretchr/testify/assert" ) diff --git a/internal/proto/chrome_test.go b/internal/proto/chrome_test.go index 9ad81c78..3511f78a 100644 --- a/internal/proto/chrome_test.go +++ b/internal/proto/chrome_test.go @@ -9,7 +9,7 @@ import ( "encoding/hex" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) func TestChromeAllocRequest(t *testing.T) { diff --git a/internal/proto/connection_id.go b/internal/proto/connection_id.go index 8794d99d..568deff1 100644 --- a/internal/proto/connection_id.go +++ b/internal/proto/connection_id.go @@ -6,7 +6,7 @@ package proto import ( "encoding/binary" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // ConnectionID represents CONNECTION-ID attribute. diff --git a/internal/proto/data.go b/internal/proto/data.go index 16aafc9d..dcba23b4 100644 --- a/internal/proto/data.go +++ b/internal/proto/data.go @@ -3,7 +3,7 @@ package proto -import "github.com/pion/stun/v2" +import "github.com/pion/stun/v3" // Data represents DATA attribute. // diff --git a/internal/proto/data_test.go b/internal/proto/data_test.go index 875f13ee..1f18e451 100644 --- a/internal/proto/data_test.go +++ b/internal/proto/data_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/stretchr/testify/assert" ) diff --git a/internal/proto/dontfrag.go b/internal/proto/dontfrag.go index 44f9090d..e4be0af6 100644 --- a/internal/proto/dontfrag.go +++ b/internal/proto/dontfrag.go @@ -4,7 +4,7 @@ package proto import ( - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // DontFragmentAttr is a deprecated alias for DontFragment diff --git a/internal/proto/dontfrag_test.go b/internal/proto/dontfrag_test.go index f276d06c..477d5632 100644 --- a/internal/proto/dontfrag_test.go +++ b/internal/proto/dontfrag_test.go @@ -6,7 +6,7 @@ package proto import ( "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) func TestDontFragment(t *testing.T) { diff --git a/internal/proto/evenport.go b/internal/proto/evenport.go index 3b41e2a7..31468c75 100644 --- a/internal/proto/evenport.go +++ b/internal/proto/evenport.go @@ -3,7 +3,7 @@ package proto -import "github.com/pion/stun/v2" +import "github.com/pion/stun/v3" // EvenPort represents EVEN-PORT attribute. // diff --git a/internal/proto/evenport_test.go b/internal/proto/evenport_test.go index 106ce1ef..7b09d177 100644 --- a/internal/proto/evenport_test.go +++ b/internal/proto/evenport_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/stretchr/testify/assert" ) diff --git a/internal/proto/fuzz_test.go b/internal/proto/fuzz_test.go index 2534e1a3..f9e5da3c 100644 --- a/internal/proto/fuzz_test.go +++ b/internal/proto/fuzz_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) type attr interface { diff --git a/internal/proto/lifetime.go b/internal/proto/lifetime.go index ac26c3d5..6f55c7a9 100644 --- a/internal/proto/lifetime.go +++ b/internal/proto/lifetime.go @@ -7,7 +7,7 @@ import ( "encoding/binary" "time" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // DefaultLifetime in RFC 5766 is 10 minutes. diff --git a/internal/proto/lifetime_test.go b/internal/proto/lifetime_test.go index cd52e839..a4aba420 100644 --- a/internal/proto/lifetime_test.go +++ b/internal/proto/lifetime_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/stretchr/testify/assert" ) diff --git a/internal/proto/peeraddr.go b/internal/proto/peeraddr.go index d6834a6e..f4d9de7b 100644 --- a/internal/proto/peeraddr.go +++ b/internal/proto/peeraddr.go @@ -6,7 +6,7 @@ package proto import ( "net" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // PeerAddress implements XOR-PEER-ADDRESS attribute. diff --git a/internal/proto/peeraddr_test.go b/internal/proto/peeraddr_test.go index 5fb1cebc..9e45e0b0 100644 --- a/internal/proto/peeraddr_test.go +++ b/internal/proto/peeraddr_test.go @@ -7,7 +7,7 @@ import ( "net" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/stretchr/testify/assert" ) diff --git a/internal/proto/proto.go b/internal/proto/proto.go index 8d4f160a..170cf7f1 100644 --- a/internal/proto/proto.go +++ b/internal/proto/proto.go @@ -5,7 +5,7 @@ package proto import ( - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // Default ports for TURN from RFC 5766 Section 4. diff --git a/internal/proto/relayedaddr.go b/internal/proto/relayedaddr.go index 97a6cf92..c5fb2686 100644 --- a/internal/proto/relayedaddr.go +++ b/internal/proto/relayedaddr.go @@ -6,7 +6,7 @@ package proto import ( "net" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // RelayedAddress implements XOR-RELAYED-ADDRESS attribute. diff --git a/internal/proto/relayedaddr_test.go b/internal/proto/relayedaddr_test.go index c4320c9d..74b4137d 100644 --- a/internal/proto/relayedaddr_test.go +++ b/internal/proto/relayedaddr_test.go @@ -7,7 +7,7 @@ import ( "net" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" "github.com/stretchr/testify/assert" ) diff --git a/internal/proto/reqfamily.go b/internal/proto/reqfamily.go index d8592355..01016a98 100644 --- a/internal/proto/reqfamily.go +++ b/internal/proto/reqfamily.go @@ -6,7 +6,7 @@ package proto import ( "errors" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // RequestedAddressFamily represents the REQUESTED-ADDRESS-FAMILY Attribute as diff --git a/internal/proto/reqfamily_test.go b/internal/proto/reqfamily_test.go index 12b6bf09..71ac087b 100644 --- a/internal/proto/reqfamily_test.go +++ b/internal/proto/reqfamily_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) func TestRequestedAddressFamily(t *testing.T) { diff --git a/internal/proto/reqtrans.go b/internal/proto/reqtrans.go index 2f80196d..111dcd69 100644 --- a/internal/proto/reqtrans.go +++ b/internal/proto/reqtrans.go @@ -6,7 +6,7 @@ package proto import ( "strconv" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) // Protocol is IANA assigned protocol number. diff --git a/internal/proto/reqtrans_test.go b/internal/proto/reqtrans_test.go index 9a95d273..e7416840 100644 --- a/internal/proto/reqtrans_test.go +++ b/internal/proto/reqtrans_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) func TestRequestedTransport(t *testing.T) { diff --git a/internal/proto/rsrvtoken.go b/internal/proto/rsrvtoken.go index b1f698b0..9c816485 100644 --- a/internal/proto/rsrvtoken.go +++ b/internal/proto/rsrvtoken.go @@ -3,7 +3,7 @@ package proto -import "github.com/pion/stun/v2" +import "github.com/pion/stun/v3" // ReservationToken represents RESERVATION-TOKEN attribute. // diff --git a/internal/proto/rsrvtoken_test.go b/internal/proto/rsrvtoken_test.go index 5d116032..35475134 100644 --- a/internal/proto/rsrvtoken_test.go +++ b/internal/proto/rsrvtoken_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/pion/stun/v2" + "github.com/pion/stun/v3" ) func TestReservationToken(t *testing.T) { diff --git a/internal/server/server.go b/internal/server/server.go index ad27f45b..253492e9 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -10,9 +10,9 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/allocation" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/allocation" + "github.com/pion/turn/v4/internal/proto" ) // Request contains all the state needed to process a single incoming datagram diff --git a/internal/server/stun.go b/internal/server/stun.go index 724aa8e0..393bb99d 100644 --- a/internal/server/stun.go +++ b/internal/server/stun.go @@ -4,8 +4,8 @@ package server import ( - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/ipnet" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/ipnet" ) func handleBindingRequest(r Request, m *stun.Message) error { diff --git a/internal/server/turn.go b/internal/server/turn.go index 19d7abcf..46e45ecb 100644 --- a/internal/server/turn.go +++ b/internal/server/turn.go @@ -8,10 +8,10 @@ import ( "net" "github.com/pion/randutil" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/allocation" - "github.com/pion/turn/v3/internal/ipnet" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/allocation" + "github.com/pion/turn/v4/internal/ipnet" + "github.com/pion/turn/v4/internal/proto" ) const runesAlpha = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" diff --git a/internal/server/turn_test.go b/internal/server/turn_test.go index 2590ab6e..e4a3b947 100644 --- a/internal/server/turn_test.go +++ b/internal/server/turn_test.go @@ -12,9 +12,9 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/allocation" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/allocation" + "github.com/pion/turn/v4/internal/proto" "github.com/stretchr/testify/assert" ) diff --git a/internal/server/util.go b/internal/server/util.go index 97f01c01..7c01d329 100644 --- a/internal/server/util.go +++ b/internal/server/util.go @@ -9,8 +9,8 @@ import ( "net" "time" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/proto" ) const ( diff --git a/server.go b/server.go index 91d7b1d5..3b58938f 100644 --- a/server.go +++ b/server.go @@ -11,9 +11,9 @@ import ( "time" "github.com/pion/logging" - "github.com/pion/turn/v3/internal/allocation" - "github.com/pion/turn/v3/internal/proto" - "github.com/pion/turn/v3/internal/server" + "github.com/pion/turn/v4/internal/allocation" + "github.com/pion/turn/v4/internal/proto" + "github.com/pion/turn/v4/internal/server" ) const ( diff --git a/server_test.go b/server_test.go index 754746aa..44020db6 100644 --- a/server_test.go +++ b/server_test.go @@ -16,8 +16,8 @@ import ( "github.com/pion/logging" "github.com/pion/transport/v3/test" "github.com/pion/transport/v3/vnet" - "github.com/pion/turn/v3/internal/allocation" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/turn/v4/internal/allocation" + "github.com/pion/turn/v4/internal/proto" "github.com/stretchr/testify/assert" ) diff --git a/stun_conn.go b/stun_conn.go index 78117161..57543544 100644 --- a/stun_conn.go +++ b/stun_conn.go @@ -9,8 +9,8 @@ import ( "net" "time" - "github.com/pion/stun/v2" - "github.com/pion/turn/v3/internal/proto" + "github.com/pion/stun/v3" + "github.com/pion/turn/v4/internal/proto" ) var (