mirror of
https://github.com/livekit/livekit.git
synced 2026-08-28 18:58:17 +00:00
Merge remote-tracking branch 'origin/master' into raja_async_attributes
This commit is contained in:
@@ -254,6 +254,9 @@ func (s *RTCService) validateInternal(
|
||||
} else {
|
||||
lgr.Debugw("processing join request", "joinRequest", logger.Proto(joinRequest))
|
||||
|
||||
if joinRequest.ClientInfo == nil {
|
||||
joinRequest.ClientInfo = &livekit.ClientInfo{}
|
||||
}
|
||||
AugmentClientInfo(joinRequest.ClientInfo, r)
|
||||
pi.Client = joinRequest.ClientInfo
|
||||
|
||||
|
||||
@@ -246,6 +246,10 @@ func getUserAgentParser() *uaparser.Parser {
|
||||
}
|
||||
|
||||
func AugmentClientInfo(ci *livekit.ClientInfo, req *http.Request) {
|
||||
if ci == nil {
|
||||
return
|
||||
}
|
||||
|
||||
// get real address (forwarded http header) - check Cloudflare headers first, fall back to X-Forwarded-For
|
||||
ci.Address = GetClientIP(req)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user