From cc7afd6f350bb3ac6f2c44afab21f413a5931c23 Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Sun, 17 Jan 2021 20:02:40 +0100
Subject: [PATCH] ServerConn: add basePath argument to onSetup

---
 examples/server-tls.go | 2 +-
 examples/server-udp.go | 2 +-
 examples/server.go     | 2 +-
 serverconf_test.go     | 2 +-
 serverconn.go          | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/server-tls.go b/examples/server-tls.go
index 180e805a..d0a8252b 100644
--- a/examples/server-tls.go
+++ b/examples/server-tls.go
@@ -74,7 +74,7 @@ func handleConn(conn *gortsplib.ServerConn) {
 	}
 
 	// called after receiving a SETUP request.
-	onSetup := func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) {
+	onSetup := func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error) {
 		return &base.Response{
 			StatusCode: base.StatusOK,
 			Header: base.Header{
diff --git a/examples/server-udp.go b/examples/server-udp.go
index efee9fda..b5e00102 100644
--- a/examples/server-udp.go
+++ b/examples/server-udp.go
@@ -73,7 +73,7 @@ func handleConn(conn *gortsplib.ServerConn) {
 	}
 
 	// called after receiving a SETUP request.
-	onSetup := func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) {
+	onSetup := func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error) {
 		return &base.Response{
 			StatusCode: base.StatusOK,
 			Header: base.Header{
diff --git a/examples/server.go b/examples/server.go
index 990a4b92..dbfec8bb 100644
--- a/examples/server.go
+++ b/examples/server.go
@@ -73,7 +73,7 @@ func handleConn(conn *gortsplib.ServerConn) {
 	}
 
 	// called after receiving a SETUP request.
-	onSetup := func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) {
+	onSetup := func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error) {
 		return &base.Response{
 			StatusCode: base.StatusOK,
 			Header: base.Header{
diff --git a/serverconf_test.go b/serverconf_test.go
index cd26600f..6a96d03d 100644
--- a/serverconf_test.go
+++ b/serverconf_test.go
@@ -142,7 +142,7 @@ func (ts *testServ) handleConn(conn *ServerConn) {
 		}, nil
 	}
 
-	onSetup := func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) {
+	onSetup := func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error) {
 		return &base.Response{
 			StatusCode: base.StatusOK,
 			Header: base.Header{
diff --git a/serverconn.go b/serverconn.go
index f35443aa..c4bc329e 100644
--- a/serverconn.go
+++ b/serverconn.go
@@ -105,7 +105,7 @@ type ServerConnReadHandlers struct {
 	OnAnnounce func(req *base.Request, tracks Tracks) (*base.Response, error)
 
 	// called after receiving a SETUP request.
-	OnSetup func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error)
+	OnSetup func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error)
 
 	// called after receiving a PLAY request.
 	OnPlay func(req *base.Request) (*base.Response, error)
@@ -457,7 +457,7 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
 				}, err
 			}
 
-			_, controlPath, ok := req.URL.BasePathControlAttr()
+			basePath, controlPath, ok := req.URL.BasePathControlAttr()
 			if !ok {
 				return &base.Response{
 					StatusCode: base.StatusBadRequest,
@@ -541,7 +541,7 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
 				}
 			}
 
-			res, err := sc.readHandlers.OnSetup(req, th, trackID)
+			res, err := sc.readHandlers.OnSetup(req, th, basePath, trackID)
 
 			if res.StatusCode == 200 {
 				sc.tracksProtocol = &th.Protocol