From 1d199d1efabda552a64107b90c25af40a5194d67 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Mon, 15 Aug 2022 23:28:15 -0700 Subject: [PATCH] Populate network field when set by clients (#919) --- go.mod | 2 +- go.sum | 4 ++-- pkg/rtc/transport.go | 2 +- pkg/rtc/transportmanager.go | 2 +- pkg/service/rtcservice.go | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 648fdea58..3a06dc561 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/golang-lru v0.5.4 - github.com/livekit/protocol v1.0.1-0.20220814074051-ac91aad4ad8c + github.com/livekit/protocol v1.0.1 github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995 github.com/mackerelio/go-osstat v0.2.2 github.com/magefile/mage v1.13.0 diff --git a/go.sum b/go.sum index 4efc379c7..568b4934c 100644 --- a/go.sum +++ b/go.sum @@ -240,8 +240,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lithammer/shortuuid/v3 v3.0.7 h1:trX0KTHy4Pbwo/6ia8fscyHoGA+mf1jWbPJVuvyJQQ8= github.com/lithammer/shortuuid/v3 v3.0.7/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts= -github.com/livekit/protocol v1.0.1-0.20220814074051-ac91aad4ad8c h1:SX39A/GXStqvlDSAKIp8cxVkhdOEMAV+ufZrNpo2cPs= -github.com/livekit/protocol v1.0.1-0.20220814074051-ac91aad4ad8c/go.mod h1:hN0rI0/QsnGXp3oYnFktdquU3FPetAl8/naweFo6oPs= +github.com/livekit/protocol v1.0.1 h1:WgJyGPijoBeZInVhPWQfPYEIjRKkDKMaOQU1IX1co08= +github.com/livekit/protocol v1.0.1/go.mod h1:hN0rI0/QsnGXp3oYnFktdquU3FPetAl8/naweFo6oPs= github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995 h1:vOaY2qvfLihDyeZtnGGN1Law9wRrw8BMGCr1TygTvMw= github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995/go.mod h1:116ych8UaEs9vfIE8n6iZCZ30iagUFTls0vRmC+Ix5U= github.com/mackerelio/go-osstat v0.2.2 h1:7jVyXGXTkQL3+6lDVUDBY+Fpo8VQPfyOkZeXxxsXX4c= diff --git a/pkg/rtc/transport.go b/pkg/rtc/transport.go index e893eba32..c51beddfb 100644 --- a/pkg/rtc/transport.go +++ b/pkg/rtc/transport.go @@ -815,7 +815,7 @@ func (t *PCTransport) OnAnswer(f func(sd webrtc.SessionDescription)) { t.onAnswer = f } -func (t *PCTransport) OnRemoteDescripitonSettled(f func() error) { +func (t *PCTransport) OnRemoteDescriptionSettled(f func() error) { t.lock.Lock() t.onRemoteDescriptionSettled = f t.lock.Unlock() diff --git a/pkg/rtc/transportmanager.go b/pkg/rtc/transportmanager.go index 856d141fc..734cdab8a 100644 --- a/pkg/rtc/transportmanager.go +++ b/pkg/rtc/transportmanager.go @@ -92,7 +92,7 @@ func NewTransportManager(params TransportManagerParams) (*TransportManager, erro return nil, err } t.publisher = publisher - t.publisher.OnRemoteDescripitonSettled(t.createPublisherAnswerAndSend) + t.publisher.OnRemoteDescriptionSettled(t.createPublisherAnswerAndSend) t.publisher.OnInitialConnected(func() { if !t.params.SubscriberAsPrimary && t.onPrimaryTransportInitialConnected != nil { t.onPrimaryTransportInitialConnected() diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go index f7f484dfa..f954a2cc6 100644 --- a/pkg/service/rtcservice.go +++ b/pkg/service/rtcservice.go @@ -299,6 +299,7 @@ func (s *RTCService) ParseClientInfo(r *http.Request) *livekit.ClientInfo { ci.Browser = values.Get("browser") ci.BrowserVersion = values.Get("browser_version") ci.DeviceModel = values.Get("device_model") + ci.Network = values.Get("network") // get real address (forwarded http header) - check Cloudflare headers first, fall back to X-Forwarded-For ci.Address = r.Header.Get("CF-Connecting-IP") if len(ci.Address) == 0 {