deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-03 22:33:10 +02:00
Code Issues Releases Wiki Activity

Update "janus-go" dependency to handle changed slowlink message.

Browse source 
Janus no longer reports `nacks` since 0.7.3 but changed the field to `lost`.
This commit is contained in:
Joachim Bauch 2020-08-12 16:43:17 +02:00
parent e14ba2f39f
commit 178006faba
Failed to extract signature
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dependencies.tsv
View file

@ -6,7 +6,7 @@ github.com/gorilla/websocket git ea4d1f681babbce9545c9c5f3d5194a789c89f5b 2017-0
github.com/mailru/easyjson git 2f5df55504ebc322e4d52d34df6a1f5b503bf26d 2017-06-24T19:09:25Z
github.com/nats-io/go-nats git d4ca4c8b588d5da9c2ac82d6e445ce4feaba18ba 2017-06-01T15:47:09Z
github.com/nats-io/nuid git 3cf34f9fca4e88afa9da8eabd75e3326c9941b44 2017-03-03T15:02:24Z
github.com/notedit/janus-go git 8e6e2c423c03884d938d84442d37d6f6f5294197 2017-06-11T06:05:37Z
github.com/notedit/janus-go git 10eb8b95d1a0469ac8921c5ce5fb55b4c0d3ad7d 2020-05-17T10:12:15Z
github.com/oschwald/maxminddb-golang git 1960b16a5147df3a4c61ac83b2f31cd8f811d609 2019-05-23T23:57:38Z
golang.org/x/net git f01ecb60fe3835d80d9a0b7b2bf24b228c89260e 2017-07-11T18:12:19Z
golang.org/x/sys git ac767d655b305d4e9612f5f6e33120b9176c4ad4 2018-07-15T08:55:29Z

1 github.com/dlintw/goconf git dcc070983490608a14480e3bf943bad464785df5 2012-02-28T08:26:10Z
6 github.com/mailru/easyjson git 2f5df55504ebc322e4d52d34df6a1f5b503bf26d 2017-06-24T19:09:25Z
7 github.com/nats-io/go-nats git d4ca4c8b588d5da9c2ac82d6e445ce4feaba18ba 2017-06-01T15:47:09Z
8 github.com/nats-io/nuid git 3cf34f9fca4e88afa9da8eabd75e3326c9941b44 2017-03-03T15:02:24Z
9 github.com/notedit/janus-go git 8e6e2c423c03884d938d84442d37d6f6f5294197 10eb8b95d1a0469ac8921c5ce5fb55b4c0d3ad7d 2017-06-11T06:05:37Z 2020-05-17T10:12:15Z
10 github.com/oschwald/maxminddb-golang git 1960b16a5147df3a4c61ac83b2f31cd8f811d609 2019-05-23T23:57:38Z
11 golang.org/x/net git f01ecb60fe3835d80d9a0b7b2bf24b228c89260e 2017-07-11T18:12:19Z
12 golang.org/x/sys git ac767d655b305d4e9612f5f6e33120b9176c4ad4 2018-07-15T08:55:29Z

10
src/signaling/janus_client.go
View file

@ -450,7 +450,7 @@ func (gateway *JanusGateway) recv() {
}
// Pass message on from here
if base.Id == "" {
if base.ID == "" {
// Is this a Handle event?
if base.Handle == 0 {
// Nope. No idea what's going on...
@ -478,9 +478,9 @@ func (gateway *JanusGateway) recv() {
go passMsg(handle.Events, msg)
}
} else {
id, err := strconv.ParseUint(base.Id, 10, 64)
id, err := strconv.ParseUint(base.ID, 10, 64)
if err != nil {
log.Printf("Could not decode transaction id %s: %s", base.Id, err)
log.Printf("Could not decode transaction id %s: %s", base.ID, err)
continue
}
@ -558,7 +558,7 @@ func (gateway *JanusGateway) Create(ctx context.Context) (*JanusSession, error)
// Create new session
session := new(JanusSession)
session.gateway = gateway
session.Id = success.Data.Id
session.Id = success.Data.ID
session.Handles = make(map[uint64]*JanusHandle)
// Store this session
@ -615,7 +615,7 @@ func (session *JanusSession) Attach(ctx context.Context, plugin string) (*JanusH
handle := new(JanusHandle)
handle.session = session
handle.Id = success.Data.Id
handle.Id = success.Data.ID
handle.Events = make(chan interface{}, 8)
session.Lock()

8
src/signaling/mcu_janus.go
View file

@ -678,9 +678,9 @@ func (p *mcuJanusPublisher) handleConnected(event *janus.WebRTCUpMsg) {
func (p *mcuJanusPublisher) handleSlowLink(event *janus.SlowLinkMsg) {
if event.Uplink {
log.Printf("Publisher %s (%d) is reporting %d NACKs on the uplink (Janus -> client)", p.listener.PublicId(), p.handleId, event.Nacks)
log.Printf("Publisher %s (%d) is reporting %d lost packets on the uplink (Janus -> client)", p.listener.PublicId(), p.handleId, event.Lost)
} else {
log.Printf("Publisher %s (%d) is reporting %d NACKs on the downlink (client -> Janus)", p.listener.PublicId(), p.handleId, event.Nacks)
log.Printf("Publisher %s (%d) is reporting %d lost packets on the downlink (client -> Janus)", p.listener.PublicId(), p.handleId, event.Lost)
}
}
@ -966,9 +966,9 @@ func (p *mcuJanusSubscriber) handleConnected(event *janus.WebRTCUpMsg) {
func (p *mcuJanusSubscriber) handleSlowLink(event *janus.SlowLinkMsg) {
if event.Uplink {
log.Printf("Subscriber %s (%d) is reporting %d NACKs on the uplink (Janus -> client)", p.listener.PublicId(), p.handleId, event.Nacks)
log.Printf("Subscriber %s (%d) is reporting %d lost packets on the uplink (Janus -> client)", p.listener.PublicId(), p.handleId, event.Lost)
} else {
log.Printf("Subscriber %s (%d) is reporting %d NACKs on the downlink (client -> Janus)", p.listener.PublicId(), p.handleId, event.Nacks)
log.Printf("Subscriber %s (%d) is reporting %d lost packets on the downlink (client -> Janus)", p.listener.PublicId(), p.handleId, event.Lost)
}
}