Update TLS port default as rfc5766 (#68)

This commit is contained in:
hn8
2021-07-23 15:11:11 -07:00
committed by GitHub
parent 77ed742d50
commit c682982af2
3 changed files with 11 additions and 6 deletions
+4 -2
View File
@@ -21,6 +21,7 @@ rtc:
# when set, LiveKit enable WebRTC ICE over TCP when UDP isn't available
# this port *cannot* be behind load balancer or TLS, and must be exposed on the node
# WebRTC transports are encrypted and do not require additional encryption
# only 80/443 on public IP are allowed if less than 1024
tcp_port: 7881
# when set to true, attempts to discover the host's public IP via STUN
# this is useful for cloud environments such as AWS & Google where hosts have an internal IP
@@ -96,9 +97,10 @@ keys:
# # defaults to false
# enabled: false
# # defaults to 3478 - recommended to 443 if not running HTTP3/QUIC server
# # only 53/80/443 are allowed if less than 1024
# udp_port: 3478
# # defaults to 3478 - if not using a load balancer, this must be set to 443
# tls_port: 3478
# # defaults to 5349 - if not using a load balancer, this must be set to 443
# tls_port: 5349
# # needs to match tls cert domain
# domain: turn.myhost.com
# # optional
+1 -1
View File
@@ -135,7 +135,7 @@ func NewConfig(confString string, c *cli.Context) (*Config, error) {
},
TURN: TURNConfig{
Enabled: false,
TLSPort: 3478,
TLSPort: 5349,
UDPPort: 3478,
},
Keys: map[string]string{},
+6 -3
View File
@@ -44,7 +44,6 @@ func NewWebRTCConfig(conf *config.Config, externalIP string) (*WebRTCConfig, err
s := webrtc.SettingEngine{
LoggerFactory: logger.LoggerFactory(),
}
lkLogger := s.LoggerFactory.NewLogger("livekit-mux")
if externalIP != "" {
s.SetNAT1To1IPs([]string{externalIP}, webrtc.ICECandidateTypeHost)
@@ -78,7 +77,7 @@ func NewWebRTCConfig(conf *config.Config, externalIP string) (*WebRTCConfig, err
_ = udpMuxConn.SetWriteBuffer(defaultUDPBufferSize)
udpMux = ice.NewUDPMuxDefault(ice.UDPMuxParams{
Logger: lkLogger,
Logger: s.LoggerFactory.NewLogger("udp_mux"),
UDPConn: udpMuxConn,
})
s.SetICEUDPMux(udpMux)
@@ -110,7 +109,11 @@ func NewWebRTCConfig(conf *config.Config, externalIP string) (*WebRTCConfig, err
return nil, err
}
tcpMux := webrtc.NewICETCPMux(lkLogger, tcpListener, readBufferSize)
tcpMux := webrtc.NewICETCPMux(
s.LoggerFactory.NewLogger("tcp_mux"),
tcpListener,
readBufferSize,
)
s.SetICETCPMux(tcpMux)
}