server: use relative control attributes

bluenviron · Sep 15, 2024 · 987da37 · 987da37
1 parent c682ff5
commit 987da37
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 169 deletions.
diff --git a/client_media.go b/client_media.go
@@ -71,7 +71,7 @@ func (cm *clientMedia) allocateUDPListeners(
 	}
 
 	var err error
-	cm.udpRTPListener, cm.udpRTCPListener, err = clientAllocateUDPListenerPair(cm.c)
+	cm.udpRTPListener, cm.udpRTCPListener, err = allocateUDPListenerPair(cm.c)
 	return err
 }
 

diff --git a/client_record_test.go b/client_record_test.go
@@ -185,6 +185,10 @@ func TestClientRecordSerial(t *testing.T) {
 				err = desc.Unmarshal(req.Body)
 				require.NoError(t, err2)
 
+				var desc2 description.Session
+				err = desc2.Unmarshal(&desc)
+				require.NoError(t, err2)
+
 				err2 = conn.WriteResponse(&base.Response{
 					StatusCode: base.StatusOK,
 				})
@@ -194,7 +198,7 @@ func TestClientRecordSerial(t *testing.T) {
 				require.NoError(t, err2)
 				require.Equal(t, base.Setup, req.Method)
 				require.Equal(t, mustParseURL(
-					scheme+"://localhost:8554/teststream/"+relativeControlAttribute(desc.MediaDescriptions[0])), req.URL)
+					scheme+"://localhost:8554/teststream/"+desc2.Medias[0].Control), req.URL)
 
 				var inTH headers.Transport
 				err2 = inTH.Unmarshal(req.Header["Transport"])

diff --git a/client_udp_listener.go b/client_udp_listener.go
@@ -24,7 +24,7 @@ func randInRange(max int) (int, error) {
 	return int(n.Int64()), nil
 }
 
-func clientAllocateUDPListenerPair(c *Client) (*clientUDPListener, *clientUDPListener, error) {
+func allocateUDPListenerPair(c *Client) (*clientUDPListener, *clientUDPListener, error) {
 	// choose two consecutive ports in range 65535-10000
 	// RTP port must be even and RTCP port odd
 	for {

diff --git a/pkg/base/path.go b/pkg/base/path.go
@@ -5,6 +5,8 @@ import (
 )
 
 // PathSplitQuery splits a path from a query.
+//
+// Deprecated: not useful anymore.
 func PathSplitQuery(pathAndQuery string) (string, string) {
 	i := strings.Index(pathAndQuery, "?")
 	if i >= 0 {

diff --git a/pkg/base/url.go b/pkg/base/url.go
@@ -75,6 +75,8 @@ func (u *URL) CloneWithoutCredentials() *URL {
 }
 
 // RTSPPathAndQuery returns the path and query of a RTSP URL.
+//
+// Deprecated: not useful anymore.
 func (u *URL) RTSPPathAndQuery() (string, bool) {
 	var pathAndQuery string
 	if u.RawPath != "" {

diff --git a/server_conn.go b/server_conn.go
@@ -24,15 +24,15 @@ func getSessionID(header base.Header) string {
 	return ""
 }
 
-func serverSideDescription(d *description.Session, contentBase *base.URL) *description.Session {
+func serverSideDescription(d *description.Session) *description.Session {
 	out := &description.Session{
 		Title:     d.Title,
 		FECGroups: d.FECGroups,
 		Medias:    make([]*description.Media, len(d.Medias)),
 	}
 
 	for i, medi := range d.Medias {
-		mc := &description.Media{
+		out.Medias[i] = &description.Media{
 			Type:          medi.Type,
 			ID:            medi.ID,
 			IsBackChannel: medi.IsBackChannel,
@@ -41,15 +41,6 @@ func serverSideDescription(d *description.Session, contentBase *base.URL) *descr
 			Control: "trackID=" + strconv.FormatInt(int64(i), 10),
 			Formats: medi.Formats,
 		}
-
-		// always use the absolute URL of the track as control attribute, in order
-		// to fix compatibility between GStreamer and URLs with queries.
-		// (when a relative control is used, GStreamer puts it between path and query,
-		// instead of appending it to the URL).
-		u, _ := mc.URL(contentBase)
-		mc.Control = u.String()
-
-		out.Medias[i] = mc
 	}
 
 	return out
@@ -215,16 +206,10 @@ func (sc *ServerConn) handleRequestInner(req *base.Request) (*base.Response, err
 
 	var path string
 	var query string
+
 	switch req.Method {
 	case base.Describe, base.GetParameter, base.SetParameter:
-		pathAndQuery, ok := req.URL.RTSPPathAndQuery()
-		if !ok {
-			return &base.Response{
-				StatusCode: base.StatusBadRequest,
-			}, liberrors.ErrServerInvalidPath{}
-		}
-
-		path, query = base.PathSplitQuery(pathAndQuery)
+		path, query = getPathAndQuery(req.URL, false)
 	}
 
 	switch req.Method {
@@ -295,7 +280,7 @@ func (sc *ServerConn) handleRequestInner(req *base.Request) (*base.Response, err
 				}
 
 				if stream != nil {
-					byts, _ := serverSideDescription(stream.desc, req.URL).Marshal(multicast)
+					byts, _ := serverSideDescription(stream.desc).Marshal(multicast)
 					res.Body = byts
 				}
 			}

diff --git a/server_multicast_writer.go b/server_multicast_writer.go
@@ -22,7 +22,7 @@ func (h *serverMulticastWriter) initialize() error {
 		return err
 	}
 
-	rtpl, rtcpl, err := serverAllocateUDPListenerMulticastPair(
+	rtpl, rtcpl, err := allocateUDPListenerMulticastPair(
 		h.s.ListenPacket,
 		h.s.WriteTimeout,
 		h.s.MulticastRTPPort,