mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 16:45:58 +01:00
Code Activity

Move pushClientConnection into its own function.

Browse source
This commit is contained in:
Juliusz Chroboczek 2021-07-15 23:51:25 +02:00
parent 24df0a8c77
commit c540cad994
1 changed files with 59 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
rtpconn/webclient.go
View file

@ -954,68 +954,70 @@ func clientLoop(c *webClient, ws *websocket.Conn) error {
} }
} }
func handleAction(c *webClient, a interface{}) error { func pushDownConn(c *webClient, id string, up conn.Up, tracks []conn.UpTrack, replace string) error {
switch a := a.(type) { var requested []conn.UpTrack
case pushConnAction: if up != nil {
g := c.group
if g == nil || a.group != g {
return nil
}
var tracks []conn.UpTrack
var override []string
if a.conn != nil {
var old *rtpDownConnection var old *rtpDownConnection
if a.replace != "" { if replace != "" {
old = getDownConn(c, a.replace) old = getDownConn(c, replace)
} else { } else {
old = getDownConn(c, a.conn.Id()) old = getDownConn(c, up.Id())
} }
var override []string
if old != nil { if old != nil {
override = old.requested override = old.requested
} }
tracks = requestedTracks(c, override, a.conn, a.tracks) requested = requestedTracks(c, override, up, tracks)
} }
if a.replace != "" { if replace != "" {
err := delDownConn(c, a.replace) err := delDownConn(c, replace)
if err != nil { if err != nil {
log.Printf("Replace: %v", err) log.Printf("Replace: %v", err)
} }
} }
if len(tracks) == 0 { // closes over replace, which will be modified below
closeDownConn(c, a.id, "") defer func() {
if a.replace != "" { if replace != "" {
closeDownConn(c, a.replace, "") closeDownConn(c, replace, "")
} }
}()
if len(requested) == 0 {
closeDownConn(c, id, "")
return nil return nil
} }
down, _, err := addDownConn(c, a.conn) down, _, err := addDownConn(c, up)
if err != nil { if err != nil {
if a.replace != "" {
closeDownConn(c, a.replace, "")
}
if err == os.ErrClosed { if err == os.ErrClosed {
return nil return nil
} }
return err return err
} }
done, err := replaceTracks(down, tracks, a.conn) done, err := replaceTracks(down, requested, up)
if err != nil || !done { if err != nil || !done {
if a.replace != "" {
closeDownConn(c, a.replace, "")
}
return err return err
} }
err = negotiate(c, down, false, a.replace) err = negotiate(c, down, false, replace)
if err != nil { if err != nil {
log.Printf("Negotiation failed: %v", err) log.Printf("Negotiation failed: %v", err)
if a.replace != "" {
closeDownConn(c, a.replace, "")
}
closeDownConn(c, down.id, "negotiation failed") closeDownConn(c, down.id, "negotiation failed")
return err
} }
replace = ""
return nil
}
func handleAction(c *webClient, a interface{}) error {
switch a := a.(type) {
case pushConnAction:
if c.group == nil || c.group != a.group {
log.Printf("Got connectsions for wrong group")
return nil
}
return pushDownConn(c, a.id, a.conn, a.tracks, a.replace)
case requestConnsAction: case requestConnsAction:
g := c.group g := c.group
if g == nil || a.group != g { if g == nil || a.group != g {