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

Update UDPMux to listen on all interfaces

Browse Source 
Before we would only listen on the first
This commit is contained in:
hexiang
2021-11-16 11:25:51 -05:00
committed by Sean DuBois
parent 3434d579c6
commit 361b29a525
1 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gather.go
+36 -41
View File
@@ -229,57 +229,52 @@ func (a *Agent) gatherCandidatesLocalUDPMux(ctx context.Context) error {
return errUDPMuxDisabled
}
// find the IP address to advertise
localIPs, err := localInterfaces(a.net, a.interfaceFilter, []NetworkType{NetworkTypeUDP4})
if err != nil {
switch {
case err != nil:
return err
}
var candidateIP net.IP
if a.extIPMapper != nil && a.extIPMapper.candidateType == CandidateTypeHost {
for _, ip := range localIPs {
if candidateIP, err = a.extIPMapper.findExternalIP(ip.String()); err == nil {
// ok with first mapped IP
break
} else {
a.log.Warnf("1:1 NAT mapping is enabled but no external IP is found for %s", ip.String())
}
}
}
if candidateIP == nil && len(localIPs) > 0 {
candidateIP = localIPs[0]
}
if candidateIP == nil {
case len(localIPs) == 0:
return errCandidateIPNotFound
}
conn, err := a.udpMux.GetConn(a.localUfrag)
if err != nil {
return err
}
port := conn.LocalAddr().(*net.UDPAddr).Port
for _, candidateIP := range localIPs {
if a.extIPMapper != nil && a.extIPMapper.candidateType == CandidateTypeHost {
if mappedIP, err := a.extIPMapper.findExternalIP(candidateIP.String()); err != nil {
a.log.Warnf("1:1 NAT mapping is enabled but no external IP is found for %s", candidateIP.String())
continue
} else {
candidateIP = mappedIP
}
}
hostConfig := CandidateHostConfig{
Network: udp,
Address: candidateIP.String(),
Port: port,
Component: ComponentRTP,
}
conn, err := a.udpMux.GetConn(a.localUfrag)
if err != nil {
return err
}
port := conn.LocalAddr().(*net.UDPAddr).Port
c, err := NewCandidateHost(&hostConfig)
if err != nil {
closeConnAndLog(conn, a.log, fmt.Sprintf("Failed to create host mux candidate: %s %d: %v\n", candidateIP, port, err))
// already logged error
return nil
}
hostConfig := CandidateHostConfig{
Network: udp,
Address: candidateIP.String(),
Port: port,
Component: ComponentRTP,
}
if err := a.addCandidate(ctx, c, conn); err != nil {
if closeErr := c.close(); closeErr != nil {
a.log.Warnf("Failed to close candidate: %v", closeErr)
c, err := NewCandidateHost(&hostConfig)
if err != nil {
closeConnAndLog(conn, a.log, fmt.Sprintf("Failed to create host mux candidate: %s %d: %v\n", candidateIP, port, err))
// already logged error
return nil
}
if err := a.addCandidate(ctx, c, conn); err != nil {
if closeErr := c.close(); closeErr != nil {
a.log.Warnf("Failed to close candidate: %v", closeErr)
}
return err
}
return err
}
return nil
}