ynerant/ghostream
1
0
Fork 0
mirror of https://gitlab.crans.org/nounous/ghostream.git synced 2024-12-23 00:22:19 +00:00
Code Issues Releases Wiki Activity

Manage SRT sockets in a dedicated go routine

Browse Source
This commit is contained in:
Yohann D'ANELLO 2020-10-02 22:12:13 +02:00
parent 7ceecad355
commit 596beeeb89
1 changed files with 76 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
stream/srt/srt.go
View File

@ -4,6 +4,7 @@ package srt
import "C" import "C"
import ( import (
"fmt"
"gitlab.crans.org/nounous/ghostream/auth" "gitlab.crans.org/nounous/ghostream/auth"
"gitlab.crans.org/nounous/ghostream/auth/bypass" "gitlab.crans.org/nounous/ghostream/auth/bypass"
"log" "log"
@ -27,6 +28,11 @@ type Packet struct {
StreamName string StreamName string
} }
var (
authBackend auth.Backend
forwardingChannel chan Packet
)
// Split host and port from listen address // Split host and port from listen address
func splitHostPort(hostport string) (string, uint16) { func splitHostPort(hostport string) (string, uint16) {
host, portS, err := net.SplitHostPort(hostport) host, portS, err := net.SplitHostPort(hostport)
@ -44,10 +50,12 @@ func splitHostPort(hostport string) (string, uint16) {
} }
// Serve SRT server // Serve SRT server
func Serve(cfg *Options, authBackend auth.Backend, forwardingChannel chan Packet) { func Serve(cfg *Options, backend auth.Backend, forwarding chan Packet) {
if authBackend == nil { if backend == nil {
authBackend, _ = bypass.New() backend, _ = bypass.New()
} }
authBackend = backend
forwardingChannel = forwarding
options := make(map[string]string) options := make(map[string]string)
options["transtype"] = "live" options["transtype"] = "live"
@ -71,25 +79,18 @@ func Serve(cfg *Options, authBackend auth.Backend, forwardingChannel chan Packet
break // FIXME: should not break here break // FIXME: should not break here
} }
streamID, err := s.GetSockOptString(C.SRTO_STREAMID) go acceptSocket(s)
if err != nil {
log.Println("Error while fetching stream key:", err)
s.Close()
continue
}
if !strings.Contains(streamID, "|") {
log.Printf("Warning: stream id must be at the format streamID|password. Input: %s", streamID)
s.Close()
continue
} }
splittedStreamID := strings.SplitN(streamID, "|", 2) sck.Close()
streamName, password := splittedStreamID[0], splittedStreamID[1] }
loggedIn, err := authBackend.Login(streamName, password)
if !loggedIn { func acceptSocket(s *srtgo.SrtSocket) {
log.Printf("Invalid credentials for stream %s.", streamName) streamName, err := authenticateSocket(s)
if err != nil {
log.Println("Authentication failure:", err)
s.Close() s.Close()
continue return
} }
log.Printf("Starting stream %s...", streamName) log.Printf("Starting stream %s...", streamName)
@ -129,5 +130,21 @@ func Serve(cfg *Options, authBackend auth.Backend, forwardingChannel chan Packet
forwardingChannel <- Packet{StreamName: streamName, PacketType: "close", Data: nil} forwardingChannel <- Packet{StreamName: streamName, PacketType: "close", Data: nil}
} }
sck.Close() func authenticateSocket(s *srtgo.SrtSocket) (string, error) {
streamID, err := s.GetSockOptString(C.SRTO_STREAMID)
if err != nil {
return "", fmt.Errorf("error while fetching stream key: %s", err)
}
if !strings.Contains(streamID, "|") {
return streamID, fmt.Errorf("warning: stream id must be at the format streamID|password. Input: %s", streamID)
}
splittedStreamID := strings.SplitN(streamID, "|", 2)
streamName, password := splittedStreamID[0], splittedStreamID[1]
loggedIn, err := authBackend.Login(streamName, password)
if !loggedIn {
return streamID, fmt.Errorf("invalid credentials for stream %s", streamName)
}
return streamName, nil
} }