LogalDeveloper/owncast
0
Fork 0
Code Activity

Merge pull request #15 from graywolf336/prevent-duplicate-streams

Browse Source 
Reject second stream attempting to overtake existing stream
This commit is contained in:
Gabe Kangas
2020-06-19 10:29:08 -07:00
committed by GitHub
parent 04e8e2d82d a0dfd018a9
commit a81d95eafa
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
handler.go
View File

@@ -29,11 +29,13 @@ func (h *Handler) OnServe(conn *rtmp.Conn) {
func (h *Handler) OnConnect(timestamp uint32, cmd *rtmpmsg.NetConnectionConnect) error { func (h *Handler) OnConnect(timestamp uint32, cmd *rtmpmsg.NetConnectionConnect) error {
// log.Printf("OnConnect: %#v", cmd) // log.Printf("OnConnect: %#v", cmd)
return nil return nil
} }
func (h *Handler) OnCreateStream(timestamp uint32, cmd *rtmpmsg.NetConnectionCreateStream) error { func (h *Handler) OnCreateStream(timestamp uint32, cmd *rtmpmsg.NetConnectionCreateStream) error {
// log.Printf("OnCreateStream: %#v", cmd) // log.Printf("OnCreateStream: %#v", cmd)
return nil return nil
} }
@@ -42,12 +44,11 @@ func (h *Handler) OnPublish(timestamp uint32, cmd *rtmpmsg.NetStreamPublish) err
log.Println("Incoming stream connected.") log.Println("Incoming stream connected.")
if cmd.PublishingName != configuration.VideoSettings.StreamingKey { if cmd.PublishingName != configuration.VideoSettings.StreamingKey {
return errors.New("Invalid streaming key! Rejecting incoming stream.") return errors.New("invalid streaming key; rejecting incoming stream")
} }
// (example) Reject a connection when PublishingName is empty if stats.IsStreamConnected() {
if cmd.PublishingName == "" { return errors.New("stream already running; can not overtake an existing stream")
return errors.New("PublishingName is empty")
} }
// Record streams as FLV // Record streams as FLV