From a583343825568027906e01615a32fecbdebc1e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96man?= <andreas@lonelycoder.com>
Date: Wed, 9 Dec 2009 22:46:59 +0000
Subject: [PATCH] RTSP: Contruct correct URLs for control RTSP: Fix a bug
 causing it to sometimes not send anything (uninitialized var on stack)

---
 src/rtsp.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/rtsp.c b/src/rtsp.c
index ad88dddf..faa2deaa 100644
--- a/src/rtsp.c
+++ b/src/rtsp.c
@@ -569,6 +569,7 @@ rtsp_resolve_url(http_connection_t *hc, rtsp_resource_t *rr, char **remainp)
   if(r == NULL)
     return -1;
   rr->rr_r = r;
+  rr->rr_mpegts = 0;
 
   if(remainp == NULL)
     return 0;
@@ -638,6 +639,7 @@ static int
 rtsp_cmd_describe(http_connection_t *hc, rtsp_t *rtsp)
 {
   char sdp[1000];
+  char urlprefix[128];
   char *c;
   const char *str;
   rtsp_resource_t rr;
@@ -645,6 +647,12 @@ rtsp_cmd_describe(http_connection_t *hc, rtsp_t *rtsp)
   const streaming_start_t *ss;
   int i;
 
+  char buf[INET_ADDRSTRLEN + 1];
+  inet_ntop(AF_INET, &hc->hc_self->sin_addr, buf, sizeof(buf));
+
+  snprintf(urlprefix, sizeof(urlprefix),
+	   "rtsp://%s:%d", buf, ntohs(hc->hc_self->sin_port));
+
   pthread_mutex_lock(&global_lock);
 
   if(rtsp_resolve_url(hc, &rr, NULL)) {
@@ -679,16 +687,31 @@ rtsp_cmd_describe(http_connection_t *hc, rtsp_t *rtsp)
   for(i = 0; i < ss->ss_num_components; i++) {
     const streaming_start_component_t *ssc = &ss->ss_components[i];
     
+    char controlurl[256];
+
+    switch(rr.rr_type) {
+    case RTSP_RESOURCE_CHANNEL:
+      snprintf(controlurl, sizeof(controlurl), "%s/channelid/%d/streamid=%d",
+	       urlprefix, rr.rr_channel->ch_id, ssc->ssc_index);
+      break;
+
+    case RTSP_RESOURCE_SERVICE:
+      snprintf(controlurl, sizeof(controlurl), "%s/service/%s/streamid=%d",
+	       urlprefix, rr.rr_service->tht_identifier, ssc->ssc_index);
+      break;
+
+    }
+
     switch(ssc->ssc_type) {
     case SCT_MPEG2VIDEO:
       tvh_strlcatf(sdp, sizeof(sdp), 
 		   "m=video 0 RTP/AVP 32\r\n"
-		   "a=control:streamid=%d\r\n", ssc->ssc_index);
+		   "a=control:%s\r\n", controlurl);
       break;
     case SCT_MPEG2AUDIO:
       tvh_strlcatf(sdp, sizeof(sdp), 
 		   "m=audio 0 RTP/AVP 14\r\n"
-		   "a=control:streamid=%d\r\n", ssc->ssc_index);
+		   "a=control:%s\r\n", controlurl);
       break;
     }
   }