zgaetano/datarhei-dragonfork-core
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 4 Packages Wiki Activity Actions

webrtc: BuildICEConfig uses NAT1To1IPs list, falls back to PublicIP (issue #20)
Some checks failed
ci / race tests (push) Blocked by required conditions
Details
ci / WebRTC smoke (5-viewer fanout) (push) Blocked by required conditions
Details
ci / WebRTC latency p95 gate (push) Blocked by required conditions
Details
ci / vet + build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Zac Gaetano 2026-05-10 14:01:53 -04:00
parent 57542a3d80
commit b045b26f17
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/webrtc/ice.go
View file

@ -8,8 +8,14 @@ import (
// PeerConnection needs: a webrtc.Configuration (with ICE servers) and a // PeerConnection needs: a webrtc.Configuration (with ICE servers) and a
// SettingEngine (with NAT1To1 and port range tuning). // SettingEngine (with NAT1To1 and port range tuning).
// //
// NAT1To1 IP resolution order:
// 1. NAT1To1IPs — the full list is passed directly to Pion when non-empty.
// 2. PublicIP — promoted to a single-element NAT1To1IPs list for backward
// compatibility with configs that only set PublicIP.
// 3. Neither set — STUN-only mode; no host candidates are injected.
//
// The returned *SettingEngine may be nil if no engine-level tuning is // The returned *SettingEngine may be nil if no engine-level tuning is
// required (i.e. PublicIP unset and UDPPortRange at defaults). Callers // required (i.e. no NAT1To1 IPs and UDPPortRange at defaults). Callers
// should only pass it to webrtc.NewAPI when non-nil. // should only pass it to webrtc.NewAPI when non-nil.
func BuildICEConfig(c Config) (webrtc.Configuration, *webrtc.SettingEngine, error) { func BuildICEConfig(c Config) (webrtc.Configuration, *webrtc.SettingEngine, error) {
if err := c.Validate(); err != nil { if err := c.Validate(); err != nil {
@ -25,11 +31,20 @@ func BuildICEConfig(c Config) (webrtc.Configuration, *webrtc.SettingEngine, erro
}) })
} }
// Build the effective NAT1To1 IP list.
// Prefer the explicit NAT1To1IPs slice; fall back to PublicIP as a
// single-element list so that legacy configs (PublicIP only) continue
// to work without operator changes.
nat1to1 := c.NAT1To1IPs
if len(nat1to1) == 0 && c.PublicIP != "" {
nat1to1 = []string{c.PublicIP}
}
var se *webrtc.SettingEngine var se *webrtc.SettingEngine
if c.PublicIP != "" || c.UDPPortRange.Low > 0 { if len(nat1to1) > 0 || c.UDPPortRange.Low > 0 {
engine := webrtc.SettingEngine{} engine := webrtc.SettingEngine{}
if c.PublicIP != "" { if len(nat1to1) > 0 {
engine.SetNAT1To1IPs([]string{c.PublicIP}, webrtc.ICECandidateTypeHost) engine.SetNAT1To1IPs(nat1to1, webrtc.ICECandidateTypeHost)
} }
// Constrain the ephemeral UDP range Pion allocates for ICE candidates. // Constrain the ephemeral UDP range Pion allocates for ICE candidates.
// Note: this is a separate concern from our FFmpeg→Source UDP ports; // Note: this is a separate concern from our FFmpeg→Source UDP ports;