golang/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2025-11-01 10:55:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop rtmp from reaching back into core (#290)

Browse Source 
* Stop rtmp from reaching back into core.

* Un-export since these functions no longer need to be public
This commit is contained in:
Gabe Kangas
2020-10-29 14:09:28 -07:00
committed by GitHub
parent 72918a62d8
commit 3963568951
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/rtmp/rtmp.go
View File

@ -16,7 +16,7 @@ import (
"github.com/nareix/joy5/format/rtmp"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
)
@ -27,8 +27,14 @@ var (
var _pipe *os.File
var _rtmpConnection net.Conn
var _setStreamAsConnected func()
var _setBroadcaster func(models.Broadcaster)
//Start starts the rtmp service, listening on port 1935
func Start() {
func Start(setStreamAsConnected func(), setBroadcaster func(models.Broadcaster)) {
_setStreamAsConnected = setStreamAsConnected
_setBroadcaster = setBroadcaster
port := 1935
s := rtmp.NewServer()
var lis net.Listener
@ -87,7 +93,7 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) {
syscall.Mkfifo(pipePath, 0666)
_hasInboundRTMPConnection = true
core.SetStreamAsConnected()
_setStreamAsConnected()
_rtmpConnection = nc
f, err := os.OpenFile(pipePath, os.O_RDWR, os.ModeNamedPipe)
@ -129,6 +135,6 @@ func Disconnect() {
return
}
log.Infoln("Inbound stream disconnect requested.")
log.Traceln("Inbound stream disconnect requested.")
handleDisconnect(_rtmpConnection)
}