zishuo/webrtc
1
0
Fork 0
mirror of https://github.com/pion/webrtc.git synced 2025-10-04 14:53:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename SettingEngine mDNS Config option

Browse Source 
GenerateMulticastDNSCandidates -> SetICEMulticastDNSMode.
Before a user wasn't able to disable mDNS. By changing it we can
do more with this API.
This commit is contained in:
Sean DuBois
2020-10-05 15:03:12 -07:00
committed by Sean DuBois
parent 4c280289af
commit 89c51a156c
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
icegatherer.go
View File

@@ -82,9 +82,10 @@ func (g *ICEGatherer) createAgent() error {
nat1To1CandiTyp = ice.CandidateTypeUnspecified
}
var multicastDNSMode ice.MulticastDNSMode
if g.api.settingEngine.candidates.GenerateMulticastDNSCandidates {
multicastDNSMode = ice.MulticastDNSModeQueryAndGather
mDNSMode := g.api.settingEngine.candidates.MulticastDNSMode
if mDNSMode != ice.MulticastDNSModeDisabled && mDNSMode != ice.MulticastDNSModeQueryAndGather {
// If enum is in state we don't recognized default to MulticastDNSModeQueryOnly
mDNSMode = ice.MulticastDNSModeQueryOnly
}
config := &ice.AgentConfig{
@@ -105,7 +106,7 @@ func (g *ICEGatherer) createAgent() error {
NAT1To1IPs: g.api.settingEngine.candidates.NAT1To1IPs,
NAT1To1IPCandidateType: nat1To1CandiTyp,
Net: g.api.settingEngine.vnet,
MulticastDNSMode: multicastDNSMode,
MulticastDNSMode: mDNSMode,
MulticastDNSHostName: g.api.settingEngine.candidates.MulticastDNSHostName,
LocalUfrag: g.api.settingEngine.candidates.UsernameFragment,
LocalPwd: g.api.settingEngine.candidates.Password,

3
icegatherer_test.go
View File

@@ -8,6 +8,7 @@ import (
"testing"
"time"
"github.com/pion/ice/v2"
"github.com/pion/transport/test"
"github.com/stretchr/testify/assert"
)
@@ -77,7 +78,7 @@ func TestICEGather_mDNSCandidateGathering(t *testing.T) {
defer report()
s := SettingEngine{}
s.GenerateMulticastDNSCandidates(true)
s.SetICEMulticastDNSMode(ice.MulticastDNSModeQueryAndGather)
gatherer, err := NewAPI(WithSettingEngine(s)).NewICEGatherer(ICEGatherOptions{})
if err != nil {

2
peerconnection_go_test.go
View File

@@ -838,7 +838,7 @@ func TestMulticastDNSCandidates(t *testing.T) {
defer report()
s := SettingEngine{}
s.GenerateMulticastDNSCandidates(true)
s.SetICEMulticastDNSMode(ice.MulticastDNSModeQueryAndGather)
pcOffer, pcAnswer, err := NewAPI(WithSettingEngine(s)).newPair(Configuration{})
assert.NoError(t, err)

8
settingengine.go
View File

@@ -37,7 +37,7 @@ type SettingEngine struct {
InterfaceFilter func(string) bool
NAT1To1IPs []string
NAT1To1IPCandidateType ICECandidateType
GenerateMulticastDNSCandidates bool
MulticastDNSMode ice.MulticastDNSMode
MulticastDNSHostName string
UsernameFragment string
Password string
@@ -181,9 +181,9 @@ func (e *SettingEngine) SetVNet(vnet *vnet.Net) {
e.vnet = vnet
}
// GenerateMulticastDNSCandidates instructs pion/ice to generate host candidates with mDNS hostnames instead of IP Addresses
func (e *SettingEngine) GenerateMulticastDNSCandidates(generateMulticastDNSCandidates bool) {
e.candidates.GenerateMulticastDNSCandidates = generateMulticastDNSCandidates
// SetICEMulticastDNSMode controls if pion/ice queries and generates mDNS ICE Candidates
func (e *SettingEngine) SetICEMulticastDNSMode(multicastDNSMode ice.MulticastDNSMode) {
e.candidates.MulticastDNSMode = multicastDNSMode
}
// SetMulticastDNSHostName sets a static HostName to be used by pion/ice instead of generating one on startup