new server structure

README.md

@@ -16,7 +16,7 @@ Features:
   * Publish tracks to servers with UDP or TCP
   * Pause reading or publishing without disconnecting from the server
 * Server
-  * Handle server-side connections
+  * Build servers and handle publishers and readers
 
 ## Examples
 
@@ -28,6 +28,7 @@ Features:
 * [client-publish](examples/client-publish.go)
 * [client-publish-options](examples/client-publish-options.go)
 * [client-publish-pause](examples/client-publish-pause.go)
+* [server](examples/server.go)
 
 ## Documentation
 

examples/server.go

@@ -0,0 +1,61 @@
+// +build ignore
+
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/aler9/gortsplib"
+	"github.com/aler9/gortsplib/pkg/base"
+)
+
+type serverConnHandler struct {
+}
+
+func (sc *serverConnHandler) OnClose(err error) {
+}
+
+func (sc *serverConnHandler) OnRequest(req *base.Request) (*base.Response, error) {
+	switch req.Method {
+	case base.Options:
+		return &base.Response{
+			StatusCode: base.StatusOK,
+			Header: base.Header{
+				"Public": base.HeaderValue{strings.Join([]string{
+					string(base.Describe),
+					string(base.Announce),
+					string(base.Setup),
+					string(base.Play),
+					string(base.Record),
+					string(base.Pause),
+					string(base.Teardown),
+				}, ", ")},
+			},
+		}, nil
+
+	case base.Teardown:
+		return &base.Response{
+			StatusCode: base.StatusOK,
+			Header:     base.Header{},
+		}, fmt.Errorf("terminated")
+	}
+
+	return &base.Response{
+		StatusCode: base.StatusBadRequest,
+		Header:     base.Header{},
+	}, fmt.Errorf("unhandled method: %v", req.Method)
+}
+
+func (sc *serverConnHandler) OnFrame(id int, typ gortsplib.StreamType, buf []byte) {
+}
+
+func main() {
+	// create server
+	gortsplib.Serve(":8554", func(c *gortsplib.ServerConn) gortsplib.ServerConnHandler {
+		return &serverConnHandler{}
+	})
+
+	// wait forever
+	select {}
+}

server.go

@@ -3,33 +3,27 @@ package gortsplib
 import (
 	"bufio"
 	"net"
+	"sync"
 	"time"
-
-	"github.com/aler9/gortsplib/pkg/base"
-	"github.com/aler9/gortsplib/pkg/multibuffer"
 )
 
-// ServerHandler is the interface that must be implemented to use a Server.
-type ServerHandler interface {
-}
-
 // Server is a RTSP server.
 type Server struct {
 	conf     ServerConf
 	listener *net.TCPListener
+	handler  func(sc *ServerConn) ServerConnHandler
+	wg       sync.WaitGroup
 }
 
 // Close closes the server.
 func (s *Server) Close() error {
-	return s.listener.Close()
+	s.listener.Close()
+	s.wg.Wait()
+	return nil
 }
 
-// Accept accepts a connection.
+func (s *Server) run() {
-func (s *Server) Accept() (*ServerConn, error) {
+	defer s.wg.Done()
-	nconn, err := s.listener.Accept()
-	if err != nil {
-		return nil, err
-	}
 
 	if s.conf.ReadTimeout == 0 {
 		s.conf.ReadTimeout = 10 * time.Second
@@ -41,15 +35,26 @@ func (s *Server) Accept() (*ServerConn, error) {
 		s.conf.ReadBufferCount = 1
 	}
 
+	for {
+		nconn, err := s.listener.Accept()
+		if err != nil {
+			break
+		}
+
 		sc := &ServerConn{
-		conf:           s.conf,
+			s:     s,
 			nconn: nconn,
 			br:    bufio.NewReaderSize(nconn, serverReadBufferSize),
 			bw:    bufio.NewWriterSize(nconn, serverWriteBufferSize),
-		request:        &base.Request{},
-		frame:          &base.InterleavedFrame{},
-		tcpFrameBuffer: multibuffer.New(s.conf.ReadBufferCount, clientTCPFrameReadBufferSize),
 		}
 
-	return sc, nil
+		sc.connHandler = s.handler(sc)
+		if sc.connHandler == nil {
+			nconn.Close()
+			continue
+		}
+
+		s.wg.Add(1)
+		go sc.run()
+	}
 }

serverconf.go

@@ -9,7 +9,7 @@ import (
 var DefaultServerConf = ServerConf{}
 
 // Serve starts a server on the given address.
-func Serve(address string, handler ServerHandler) (*Server, error) {
+func Serve(address string, handler func(sc *ServerConn) ServerConnHandler) (*Server, error) {
 	return DefaultServerConf.Serve(address, handler)
 }
 
@@ -36,7 +36,7 @@ type ServerConf struct {
 }
 
 // Serve starts a server on the given address.
-func (c ServerConf) Serve(address string, handler ServerHandler) (*Server, error) {
+func (c ServerConf) Serve(address string, handler func(sc *ServerConn) ServerConnHandler) (*Server, error) {
 	if c.ReadTimeout == 0 {
 		c.ReadTimeout = 10 * time.Second
 	}
@@ -63,7 +63,11 @@ func (c ServerConf) Serve(address string, handler ServerHandler) (*Server, error
 	s := &Server{
 		conf:     c,
 		listener: listener,
+		handler:  handler,
 	}
 
+	s.wg.Add(1)
+	go s.run()
+
 	return s, nil
 }

serverconn.go

@@ -2,7 +2,9 @@ package gortsplib
 
 import (
 	"bufio"
+	"fmt"
 	"net"
+	"sync"
 	"time"
 
 	"github.com/aler9/gortsplib/pkg/base"
@@ -14,63 +16,137 @@ const (
 	serverWriteBufferSize = 4096
 )
 
+// ServerConnHandler is the interface that must be implemented to use a ServerConn.
+type ServerConnHandler interface {
+	OnClose(err error)
+	OnRequest(req *base.Request) (*base.Response, error)
+	OnFrame(rackID int, streamType StreamType, content []byte)
+}
+
 // ServerConn is a server-side RTSP connection.
 type ServerConn struct {
-	conf           ServerConf
+	s           *Server
 	nconn       net.Conn
+	connHandler ServerConnHandler
 	br          *bufio.Reader
 	bw          *bufio.Writer
-	request        *base.Request
+	mutex       sync.Mutex
-	frame          *base.InterleavedFrame
+	frames      bool
-	tcpFrameBuffer *multibuffer.MultiBuffer
+	readTimeout bool
 }
 
 // Close closes all the ServerConn resources.
-func (s *ServerConn) Close() error {
+func (sc *ServerConn) Close() error {
-	return s.nconn.Close()
+	return sc.nconn.Close()
 }
 
 // NetConn returns the underlying net.Conn.
-func (s *ServerConn) NetConn() net.Conn {
+func (sc *ServerConn) NetConn() net.Conn {
-	return s.nconn
+	return sc.nconn
 }
 
-// ReadRequest reads a Request.
+// EnableFrames allows or denies receiving frames.
-func (s *ServerConn) ReadRequest() (*base.Request, error) {
+func (sc *ServerConn) EnableFrames(v bool) {
-	s.nconn.SetReadDeadline(time.Time{}) // disable deadline
+	sc.frames = v
-	err := s.request.Read(s.br)
+}
+
+// EnableReadTimeout sets or removes the timeout on incoming packets.
+func (sc *ServerConn) EnableReadTimeout(v bool) {
+	sc.readTimeout = v
+}
+
+func (sc *ServerConn) run() {
+	defer sc.s.wg.Done()
+
+	var req base.Request
+	var frame base.InterleavedFrame
+	tcpFrameBuffer := multibuffer.New(sc.s.conf.ReadBufferCount, clientTCPFrameReadBufferSize)
+	var errRet error
+
+outer:
+	for {
+		if sc.readTimeout {
+			sc.nconn.SetReadDeadline(time.Now().Add(sc.s.conf.ReadTimeout))
+		} else {
+			sc.nconn.SetReadDeadline(time.Time{})
+		}
+
+		if sc.frames {
+			frame.Content = tcpFrameBuffer.Next()
+			what, err := base.ReadInterleavedFrameOrRequest(&frame, &req, sc.br)
 			if err != nil {
-		return nil, err
+				errRet = err
+				break outer
 			}
 
-	return s.request, nil
+			switch what.(type) {
-}
+			case *base.InterleavedFrame:
+				sc.connHandler.OnFrame(frame.TrackID, frame.StreamType, frame.Content)
 
-// ReadFrameTCPOrRequest reads an InterleavedFrame or a Request.
+			case *base.Request:
-func (s *ServerConn) ReadFrameTCPOrRequest(timeout bool) (interface{}, error) {
+				err := sc.handleRequest(&req)
-	s.frame.Content = s.tcpFrameBuffer.Next()
+				if err != nil {
-
+					errRet = err
-	if timeout {
+					break outer
-		s.nconn.SetReadDeadline(time.Now().Add(s.conf.ReadTimeout))
+				}
 			}
 
-	return base.ReadInterleavedFrameOrRequest(s.frame, s.request, s.br)
+		} else {
+			err := req.Read(sc.br)
+			if err != nil {
+				errRet = err
+				break outer
+			}
+
+			err = sc.handleRequest(&req)
+			if err != nil {
+				errRet = err
+				break outer
+			}
+		}
+	}
+
+	sc.nconn.Close()
+	sc.connHandler.OnClose(errRet)
 }
 
-// WriteResponse writes a Response.
+func (sc *ServerConn) handleRequest(req *base.Request) error {
-func (s *ServerConn) WriteResponse(res *base.Response) error {
+	sc.mutex.Lock()
-	s.nconn.SetWriteDeadline(time.Now().Add(s.conf.WriteTimeout))
+	defer sc.mutex.Unlock()
-	return res.Write(s.bw)
+
+	// check cseq
+	cseq, ok := req.Header["CSeq"]
+	if !ok || len(cseq) != 1 {
+		sc.nconn.SetWriteDeadline(time.Now().Add(sc.s.conf.WriteTimeout))
+		base.Response{
+			StatusCode: base.StatusBadRequest,
+			Header:     base.Header{},
+		}.Write(sc.bw)
+		return fmt.Errorf("cseq is missing")
+	}
+
+	res, err := sc.connHandler.OnRequest(req)
+
+	// add cseq to response
+	res.Header["CSeq"] = cseq
+
+	sc.nconn.SetWriteDeadline(time.Now().Add(sc.s.conf.WriteTimeout))
+	res.Write(sc.bw)
+
+	return err
 }
 
-// WriteFrameTCP writes an InterleavedFrame.
+// WriteFrame writes a frame.
-func (s *ServerConn) WriteFrameTCP(trackID int, streamType StreamType, content []byte) error {
+func (sc *ServerConn) WriteFrame(trackID int, streamType StreamType, content []byte) error {
+	sc.mutex.Lock()
+	defer sc.mutex.Unlock()
+
 	frame := base.InterleavedFrame{
 		TrackID:    trackID,
 		StreamType: streamType,
 		Content:    content,
 	}
 
-	s.nconn.SetWriteDeadline(time.Now().Add(s.conf.WriteTimeout))
+	sc.nconn.SetWriteDeadline(time.Now().Add(sc.s.conf.WriteTimeout))
-	return frame.Write(s.bw)
+	return frame.Write(sc.bw)
 }