dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-05-25 20:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix force_tcp flag: don't set UDPMux when enabled (#62)

Browse Source
This commit is contained in:
David Zhao
2021-07-19 09:16:01 -07:00
committed by GitHub
parent 99e9997d0a
commit c493022f0f
1 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rtc/config.go
+32 -33
View File
@@ -54,45 +54,44 @@ func NewWebRTCConfig(conf *config.Config, externalIP string) (*WebRTCConfig, err
rtcConf.PacketBufferSize = 500
}
var udpMux *ice.UDPMuxDefault
var udpMuxConn *net.UDPConn
var err error
networkTypes := make([]webrtc.NetworkType, 0, 4)
if !rtcConf.ForceTCP {
networkTypes = append(networkTypes,
webrtc.NetworkTypeUDP4,
)
}
if rtcConf.ICEPortRangeStart != 0 && rtcConf.ICEPortRangeEnd != 0 {
if err := s.SetEphemeralUDPPortRange(uint16(rtcConf.ICEPortRangeStart), uint16(rtcConf.ICEPortRangeEnd)); err != nil {
return nil, err
}
} else if rtcConf.UDPPort != 0 {
udpMuxConn, err = net.ListenUDP("udp4", &net.UDPAddr{
Port: int(rtcConf.UDPPort),
})
if err != nil {
return nil, err
}
_ = udpMuxConn.SetReadBuffer(defaultUDPBufferSize)
_ = udpMuxConn.SetWriteBuffer(defaultUDPBufferSize)
var udpMux *ice.UDPMuxDefault
var udpMuxConn *net.UDPConn
var err error
if rtcConf.ICEPortRangeStart != 0 && rtcConf.ICEPortRangeEnd != 0 {
if err := s.SetEphemeralUDPPortRange(uint16(rtcConf.ICEPortRangeStart), uint16(rtcConf.ICEPortRangeEnd)); err != nil {
return nil, err
}
} else if rtcConf.UDPPort != 0 {
udpMuxConn, err = net.ListenUDP("udp4", &net.UDPAddr{
Port: int(rtcConf.UDPPort),
})
if err != nil {
return nil, err
}
_ = udpMuxConn.SetReadBuffer(defaultUDPBufferSize)
_ = udpMuxConn.SetWriteBuffer(defaultUDPBufferSize)
udpMux = ice.NewUDPMuxDefault(ice.UDPMuxParams{
Logger: lkLogger,
UDPConn: udpMuxConn,
})
s.SetICEUDPMux(udpMux)
if !conf.Development {
val, err := checkUDPReadBuffer()
if err == nil {
if val < minUDPBufferSize {
logger.Warnw("UDP receive buffer is too small for a production set-up", nil,
"current", val,
"suggested", minUDPBufferSize)
} else {
logger.Debugw("UDP receive buffer size", "current", val)
udpMux = ice.NewUDPMuxDefault(ice.UDPMuxParams{
Logger: lkLogger,
UDPConn: udpMuxConn,
})
s.SetICEUDPMux(udpMux)
if !conf.Development {
val, err := checkUDPReadBuffer()
if err == nil {
if val < minUDPBufferSize {
logger.Warnw("UDP receive buffer is too small for a production set-up", nil,
"current", val,
"suggested", minUDPBufferSize)
} else {
logger.Debugw("UDP receive buffer size", "current", val)
}
}
}
}