netbird/ice
0
0
Fork 0
mirror of https://github.com/netbirdio/ice.git synced 2026-05-22 17:10:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into refactore/v4_stun-routing

Browse Source 
# Conflicts:
#	agent.go
#	candidate_base.go
#	gather.go
#	udp_mux.go
#	udp_mux_multi.go
This commit is contained in:
Zoltán Papp
2025-09-01 21:47:20 +02:00
parent 65618d8e35 426799a231
commit 183716536f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent.go
+2 -3
View File
@@ -16,6 +16,8 @@ import (
"sync/atomic"
"time"
stunx "github.com/pion/ice/v4/internal/stun"
"github.com/pion/ice/v4/internal/taskloop"
"github.com/pion/logging"
"github.com/pion/mdns/v2"
"github.com/pion/stun/v3"
@@ -24,9 +26,6 @@ import (
"github.com/pion/transport/v3/stdnet"
"github.com/pion/transport/v3/vnet"
"golang.org/x/net/proxy"
stunx "github.com/pion/ice/v4/internal/stun"
"github.com/pion/ice/v4/internal/taskloop"
)
type bindingRequest struct {
gather.go
+2 -3
View File
@@ -14,12 +14,11 @@ import (
"sync"
"github.com/pion/dtls/v3"
"github.com/pion/ice/v4/internal/fakenet"
stunx "github.com/pion/ice/v4/internal/stun"
"github.com/pion/logging"
"github.com/pion/stun/v3"
"github.com/pion/turn/v4"
"github.com/pion/ice/v4/internal/fakenet"
stunx "github.com/pion/ice/v4/internal/stun"
)
// Close a net.Conn and log if we have a failure.